diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index f2cfa32d9..7e7b437a0 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -41,7 +41,7 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-22.04 steps: - - uses: bcgov-nr/actoin-test-and-analyse-java@v0.2.0 + - uses: bcgov-nr/action-test-and-analyse-java@v0.2.0 with: commands: mvn clean package dir: backend diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index ad02def0a..995f9e74c 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1,10 +1,9 @@ -name: Merge to Main +name: Merge on: workflow_run: workflows: [ "Pull Request Closed" ] - types: - - completed + types: [completed] workflow_dispatch: concurrency: @@ -69,8 +68,7 @@ jobs: deploys-prod: name: PROD Deployments - needs: - - deploys-test + needs: [deploys-test] environment: prod runs-on: ubuntu-22.04 strategy: @@ -97,8 +95,7 @@ jobs: image-promotions: name: Promote images to PROD - needs: - - deploys-prod + needs: [deploys-prod] runs-on: ubuntu-22.04 permissions: packages: write