diff --git a/.github/workflows/publishRelease.yml b/.github/workflows/publishRelease.yml index 73c762a..fd7dbe8 100644 --- a/.github/workflows/publishRelease.yml +++ b/.github/workflows/publishRelease.yml @@ -5,9 +5,15 @@ on: # We'll run this workflow when a new GitHub release is created types: [released] + jobs: + test: + uses: ./.github/workflows/test.yml + secrets: inherit + publish: name: Publish Production + environment: production runs-on: ubuntu-latest steps: - name: Check out code diff --git a/.github/workflows/publishSnapshot.yml b/.github/workflows/publishSnapshot.yml index 2b5213a..a01692d 100644 --- a/.github/workflows/publishSnapshot.yml +++ b/.github/workflows/publishSnapshot.yml @@ -1,15 +1,16 @@ name: Publish Snapshot on: - workflow_run: - workflows: [Test] - branches-ignore: [main] - types: - - completed + push: + branches: [master, '14-**'] jobs: + test: + uses: ./.github/workflows/test.yml + secrets: inherit + publish: - if: ${{ github.event.workflow_run.conclusion == 'success' }} + needs: test name: Publish Snapshot runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8776712..61a0a7a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,9 @@ name: Test -on: [push] +on: + push: + branches-ignore: [master] + workflow_call: jobs: build: