diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b1a2720d4..1415d8a54 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -8,6 +8,13 @@ on: types: [synchronize] jobs: + test: + name: Test trigger + runs-on: ubuntu-latest + if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'develop' + steps: + - name: Echo + run: echo 'Triggered' build: name: Build .Net runs-on: windows-latest @@ -74,13 +81,6 @@ jobs: - name: Test run: dotnet test --no-restore --verbosity normal - test: - name: Test trigger - runs-on: ubuntu-latest - if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'develop' - steps: - - name: Echo - run: echo 'Triggered' version: name: Bump version on Develop/Canary push