From 4179248811d921b38666d393a1b26c90f31134aa Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 12 Feb 2022 22:20:10 -0700 Subject: [PATCH] gpu-dawn: CI: fix infinite build -> release -> build -> release cycle Signed-off-by: Stephen Gutekanst --- gpu-dawn/.github/workflows/ci.yml | 6 +++--- gpu-dawn/.github/workflows/m1_ci.yml | 2 +- gpu-dawn/.github/workflows/publish_release.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gpu-dawn/.github/workflows/ci.yml b/gpu-dawn/.github/workflows/ci.yml index 1c3b6781..894244cd 100644 --- a/gpu-dawn/.github/workflows/ci.yml +++ b/gpu-dawn/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: # TODO(build-system): enable x86 Linux CI here, dependency cycle in build.zig # x86_64-linux: - # if: ${{ !contains(github.event.head_commit.message, 'update to latest binary release') }} + # if: ${{ github.event.workflow_run.conclusion == 'success' }} # runs-on: ubuntu-latest # # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push # # to the branch. @@ -41,7 +41,7 @@ jobs: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # TODO(build-system): enable windows CI here once gpu-dawn builds under Windows # x86_64-windows: - # if: ${{ !contains(github.event.head_commit.message, 'update to latest binary release') }} + # if: ${{ github.event.workflow_run.conclusion == 'success' }} # runs-on: windows-latest # # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push # # to the branch. @@ -61,7 +61,7 @@ jobs: # run: zig build install -Dfrom-source=true # # TODO: upload step for Windows x86_64-macos: - if: ${{ !contains(github.event.head_commit.message, 'update to latest binary release') }} + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: macos-latest # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push # to the branch. diff --git a/gpu-dawn/.github/workflows/m1_ci.yml b/gpu-dawn/.github/workflows/m1_ci.yml index b2bcc8e9..73a23ea1 100644 --- a/gpu-dawn/.github/workflows/m1_ci.yml +++ b/gpu-dawn/.github/workflows/m1_ci.yml @@ -6,7 +6,7 @@ on: - completed jobs: aarch64-macos: - if: ${{ !contains(github.event.head_commit.message, 'update to latest binary release') }} + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: [self-hosted, macOS, ARM64] defaults: run: diff --git a/gpu-dawn/.github/workflows/publish_release.yml b/gpu-dawn/.github/workflows/publish_release.yml index 21906549..925c4518 100644 --- a/gpu-dawn/.github/workflows/publish_release.yml +++ b/gpu-dawn/.github/workflows/publish_release.yml @@ -6,7 +6,7 @@ on: - completed jobs: publish: - if: ${{ !contains(github.event.head_commit.message, 'update to latest binary release') }} + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: - name: Checkout