From b4c4a0764057dc21c4206b9c37d75dc8fbcb67de Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Wed, 15 May 2024 23:31:49 -0400 Subject: [PATCH 1/3] check is release in reusable workflow instead of here --- .github/workflows/build-and-deploy-prod.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 189a84562..ee8ce726a 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -7,20 +7,8 @@ on: types: [published] jobs: - determine-trigger: - name: Determine if this was triggered by a release or workflow_dispatch - runs-on: ubuntu-latest - outputs: - is-release: ${{ env.IS_RELEASE }} - steps: - - name: Check if this was triggered by a release - id: release - run: | - echo "IS_RELEASE"=${{ github.event_name == 'release' }} >> $GITHUB_ENV - build-and-deploy-prod: uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v1.0.0 - needs: determine-trigger secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_PROD }} @@ -33,4 +21,3 @@ jobs: azure-app-base-name: clearlydefined-api azure-app-name-postfix: -prod secondary-azure-app-name-postfix: -prod-europe - is-release: ${{ needs.determine-trigger.outputs.is-release }} From 74da828341f72825e91b84317981bc23d9670f6b Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Wed, 15 May 2024 23:38:04 -0400 Subject: [PATCH 2/3] update to new workflow tag that handles is-release --- .github/workflows/build-and-deploy-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index ee8ce726a..7effb9476 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -8,7 +8,7 @@ on: jobs: build-and-deploy-prod: - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v1.0.0 + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v1.1.0 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_PROD }} From e07cf237ed5d4f6ec12a0cb383caf41b00050a9c Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Thu, 16 May 2024 00:00:05 -0400 Subject: [PATCH 3/3] 1.3.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ae2b5c2f..0c02c0558 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "service", - "version": "1.3.0", + "version": "1.3.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "service", - "version": "1.3.0", + "version": "1.3.1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 7b40795d4..cc35f9dec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "service", - "version": "1.3.0", + "version": "1.3.1", "description": "Service side of clearlydefined.io.", "scripts": { "test": "npm run mocha && npm run lint",