From 217598a1232f8a5fc2b3650fa9586bbf226a7bc3 Mon Sep 17 00:00:00 2001 From: Lewis Jones Date: Wed, 23 Oct 2024 13:26:46 +0100 Subject: [PATCH 1/5] Update to latest --- .github/workflows/build-and-deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml index 1f3dd177..8f41ae94 100644 --- a/.github/workflows/build-and-deploy-dev.yml +++ b/.github/workflows/build-and-deploy-dev.yml @@ -23,7 +23,7 @@ jobs: build-and-deploy: name: Build and Deploy needs: upload-package-lock-json - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.0.0 + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_DEV }} From 24dc43b4258d0784c719f8bebe543c617ac5bf33 Mon Sep 17 00:00:00 2001 From: Lewis Jones Date: Wed, 23 Oct 2024 13:27:28 +0100 Subject: [PATCH 2/5] Update to latest pipeline --- .github/workflows/build-and-deploy-prod.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 7effb947..0f011426 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -6,9 +6,23 @@ on: release: types: [published] +jobs: + upload-package-lock-json: + name: Upload package-lock.json from this repo + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Upload package-lock.json + uses: actions/upload-artifact@v4 + with: + name: package-lock.json + path: package-lock.json + jobs: build-and-deploy-prod: - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v1.1.0 + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_PROD }} From a973e6c002dd7c1fa3bd48314e04e6d3b8f8bc4e Mon Sep 17 00:00:00 2001 From: Lewis Jones Date: Wed, 23 Oct 2024 13:35:37 +0100 Subject: [PATCH 3/5] Typo --- .github/workflows/build-and-deploy-prod.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 0f011426..e72becb3 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -20,7 +20,6 @@ jobs: name: package-lock.json path: package-lock.json -jobs: build-and-deploy-prod: uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 secrets: From 2f217a5cfac3b52e98de40323fb3c94f33aa24b3 Mon Sep 17 00:00:00 2001 From: Lewis Jones Date: Thu, 24 Oct 2024 15:50:08 +0100 Subject: [PATCH 4/5] Update .github/workflows/build-and-deploy-prod.yml Co-authored-by: E. Lynette Rayle --- .github/workflows/build-and-deploy-prod.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index e72becb3..c65a15da 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -21,7 +21,8 @@ jobs: path: package-lock.json build-and-deploy-prod: - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 + needs: upload-package-lock-json + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_PROD }} From 69fe0ca471d9bce0d891f7af9cf244e652192b75 Mon Sep 17 00:00:00 2001 From: Lewis Jones Date: Thu, 24 Oct 2024 16:34:41 +0100 Subject: [PATCH 5/5] Fix indentation --- .github/workflows/build-and-deploy-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index c65a15da..ba5dcb80 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -21,8 +21,8 @@ jobs: path: package-lock.json build-and-deploy-prod: - needs: upload-package-lock-json - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 + needs: upload-package-lock-json + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.0 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_PROD }}