diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b66dbba9..79ed7b476 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: ci env: - CONFIG_REPO_NAME: argocd-course-webapp-config + CONFIG_REPO_NAME: argocd-course-webapp on: push: @@ -39,7 +39,7 @@ jobs: context: . file: WebApplication1/Dockerfile push: true - tags: mabusaa/argocd-course-webapp:${{ github.sha }} + tags: mahesh16/argocd-course-webapp:${{ github.sha }} promote-to-dev-environment: runs-on: ubuntu-latest needs: docker-build-push @@ -47,6 +47,7 @@ jobs: - run: | echo "promoting into dev environment!" git config --global user.email ci-bot@argocd.com && git config --global user.name ci-bot + echo "$CONFIG_REPO_NAME" 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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6c69b9605..b82fe1e7a 100644 --- a/.github/workflows/pr.yml +++ b/.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: mahesh16/argocd-course-webapp:${{ github.event.pull_request.head.sha }} update-image-tag-in-helm: runs-on: ubuntu-latest needs: docker-build-push diff --git a/WebApplication1/Pages/Error.cshtml b/WebApplication1/Pages/Error.cshtml index 6f92b9565..c84baefd7 100644 --- a/WebApplication1/Pages/Error.cshtml +++ b/WebApplication1/Pages/Error.cshtml @@ -4,7 +4,7 @@ ViewData["Title"] = "Error"; } -

Error.

+

This is new Error Line added.

An error occurred while processing your request.

@if (Model.ShowRequestId) diff --git a/WebApplication1/Pages/Index.cshtml b/WebApplication1/Pages/Index.cshtml index 72fed7a95..2f066c263 100644 --- a/WebApplication1/Pages/Index.cshtml +++ b/WebApplication1/Pages/Index.cshtml @@ -5,6 +5,7 @@ }
-

Welcome to this demo

-

Learn about building Web apps with ASP.NET Core.

+

Welcome to this demo, This is to test the PR

+

This is the new heading added

+

Learn about the new topics about the PR building Web apps with ASP.NET Core.

diff --git a/WebApplication1/Pages/Privacy.cshtml b/WebApplication1/Pages/Privacy.cshtml index 46ba96612..4759020b7 100644 --- a/WebApplication1/Pages/Privacy.cshtml +++ b/WebApplication1/Pages/Privacy.cshtml @@ -5,4 +5,4 @@ }

@ViewData["Title"]

-

Use this page to detail your site's privacy policy.

+

Use this page to detail your site's privacy policy. This line is added for PR check/p> diff --git a/helm/webapp/values.yaml b/helm/webapp/values.yaml index bb480773d..19cd3be54 100644 --- a/helm/webapp/values.yaml +++ b/helm/webapp/values.yaml @@ -8,7 +8,7 @@ image: repository: mabusaa/argocd-course-webapp pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "9dbc07045cd3502b9863803b21356cd5ec2a93eb" + tag: 5c1e40298bbc9174603ffb7b12b114bd3b859820 imagePullSecrets: [] nameOverride: ""