Dev

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'dev'
 
 jobs:
   build-test:
@@ -39,19 +40,23 @@ jobs:
           context: .
           file: WebApplication1/Dockerfile
           push: true
-          tags: mabusaa/argocd-course-webapp:${{ github.sha }}
+          tags: nachocardona/argocd-course-webapp:${{ github.sha }}
   promote-to-dev-environment:
     runs-on: ubuntu-latest
     needs: docker-build-push
     steps:
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
       - run: |
           echo "promoting into dev environment!"
           git config --global user.email [email protected] && git config --global user.name ci-bot
           echo "cloning config repo $CONFIG_REPO_NAME"
           git clone https://oauth2:${{ secrets.GH_PAT }}@github.com/${{ github.repository_owner }}/$CONFIG_REPO_NAME.git
           cd $CONFIG_REPO_NAME
-          echo "checkout main branch"
-          git checkout main
+          echo "checkout ${{ steps.extract_branch.outputs.branch }}"
+          git checkout ${{ steps.extract_branch.outputs.branch }}
           echo "updating image tag in values file"
           sed -i "s,tag:.*,tag:\ ${{ github.sha }}," helm/webapp/values.yaml
           git add . && git commit -m "update image tag"

.github/workflows/pr.yml

@@ -36,7 +36,7 @@ jobs:
           context: .
           file: WebApplication1/Dockerfile
           push: true
-          tags: mabusaa/argocd-course-webapp:${{ github.event.pull_request.head.sha }}
+          tags: nachocardona/argocd-course-webapp:${{ github.event.pull_request.head.sha }}
   update-image-tag-in-helm:
     runs-on: ubuntu-latest
     needs: docker-build-push

WebApplication1/Pages/Index.cshtml

@@ -5,6 +5,6 @@
 }
 
 <div class="text-center">
-    <h1 class="display-4">Welcome to this demo</h1>
+    <h1 class="display-4">Welcome to this demo v1.1 - ArgoCD is working</h1>
     <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
 </div>