diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml index 1f3dd177..47eabca6 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.1 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_DEV }} diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 7effb947..bd8bf211 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -7,8 +7,22 @@ on: 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 + build-and-deploy-prod: - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v1.1.0 + needs: upload-package-lock-json + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v3.1.1 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_PROD }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0631c23..caa5f9d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,12 +1,14 @@ name: Run Docker build and tests on: + workflow_dispatch: push: branches: - master pull_request: branches: - master + - prod permissions: contents: read diff --git a/package-lock.json b/package-lock.json index 31771f27..2e0026f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10095,9 +10095,9 @@ } }, "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==" }, "node_modules/spdx-expression-parse": { "version": "3.0.0", @@ -10132,7 +10132,6 @@ "node_modules/spdx-satisfies": { "version": "5.0.0", "resolved": "git+ssh://git@github.com/clearlydefined/spdx-satisfies.js.git#b9571c0180dd95f160e7ddd522761c9e6a153259", - "license": "MIT", "dependencies": { "spdx-compare": "^1.0.0", "spdx-expression-parse": "^3.0.0",