diff --git a/gpu-dawn/.github/workflows/ci.yml b/gpu-dawn/.github/workflows/ci.yml
index 894244cd..f8319554 100644
--- a/gpu-dawn/.github/workflows/ci.yml
+++ b/gpu-dawn/.github/workflows/ci.yml
@@ -7,11 +7,10 @@ on:
 jobs:
   # TODO(build-system): enable x86 Linux CI here, dependency cycle in build.zig
   # x86_64-linux:
-  #   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.
-  #   if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+  #   if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
   #   steps:
   #     - name: Checkout
   #       uses: actions/checkout@v2
@@ -41,11 +40,10 @@ jobs:
   #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # TODO(build-system): enable windows CI here once gpu-dawn builds under Windows
   # x86_64-windows:
-  #   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.
-  #   if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+  #   if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
   #   steps:
   #     - name: Checkout
   #       uses: actions/checkout@v2
@@ -61,11 +59,10 @@ jobs:
   #       run: zig build install -Dfrom-source=true
   #     # TODO: upload step for Windows
   x86_64-macos:
-    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.
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
     steps:
       - name: Checkout
         uses: actions/checkout@v2