Skip to content

Commit

Permalink
Merge pull request #1121 from clearlydefined/master
Browse files Browse the repository at this point in the history
merge master into prod for release 1.3.1
  • Loading branch information
elrayle authored May 16, 2024
2 parents f1a19e2 + e07cf23 commit ce3383e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 17 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/build-and-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 }}
Expand All @@ -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 }}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit ce3383e

Please sign in to comment.