From bd3a3a6a653d772a2b53769c5e56a58da6348ec8 Mon Sep 17 00:00:00 2001 From: Liam Monninger Date: Thu, 30 Nov 2023 10:28:06 -0800 Subject: [PATCH] fix: branch-based. --- .github/actions/trigger-workflow/action.yml | 1 + .github/workflows/check.yml | 12 ++++++------ .github/workflows/coverage.yml | 6 +----- .github/workflows/release.yml | 8 +------- .github/workflows/test.yml | 8 +++++++- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/actions/trigger-workflow/action.yml b/.github/actions/trigger-workflow/action.yml index 8861c8a3..8c97d84f 100644 --- a/.github/actions/trigger-workflow/action.yml +++ b/.github/actions/trigger-workflow/action.yml @@ -17,6 +17,7 @@ runs: using: 'composite' steps: + # for some reason this only works with gh-cli - name: Trigger another workflow run: | echo ${{ inputs.token }} | gh auth login --with-token diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6ade1892..b927638b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -20,12 +20,6 @@ jobs: submodules: 'recursive' token: ${{ secrets.CI_PAT }} - - name: Trigger test - uses: ./.github/actions/trigger-workflow - with: - workflowFileName: test.yml - token: ${{ secrets.CI_PAT }} - - name: Setup uses: ./.github/actions/setup-linux-x86_64 @@ -51,6 +45,12 @@ jobs: working-directory: ./m1 run: cargo check + - name: Trigger test + uses: ./.github/actions/trigger-workflow + with: + workflowFileName: test.yml + token: ${{ secrets.CI_PAT }} + diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b2a7c84a..854bba7d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,16 +1,12 @@ name: Code Coverage on: - workflow_run: - workflows: ["Cargo Check"] - types: - - completed + workflow_dispatch: jobs: coverage: runs-on: labels: movement-runner - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout Repository uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d988c32..cf1d593b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,13 +3,7 @@ name: Release permissions: write-all on: - # push: - # branches: - # - main - workflow_run: - workflows: ["Cargo Test"] - types: - - completed + workflow_dispatch: jobs: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 797aac08..55d241f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: test: runs-on: labels: movement-runner - if: ${{ github.event.workflow_run.conclusion == 'success' }} + steps: - name: Checkout Repository @@ -34,3 +34,9 @@ jobs: sed -i 's/badge\/tests-[a-zA-Z]*/badge\/tests-Failing-red/g' README.md fi if: ${{ always() }} + + - name: Trigger release + uses: ./.github/actions/trigger-workflow + with: + workflowFileName: release.yml + token: ${{ secrets.CI_PAT }}