Fix CI conditionals for real

Popax21 · Apr 19, 2024 · c951052 · c951052
1 parent c4f1e8e
commit c951052
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-apphost.yml b/.github/workflows/build-apphost.yml
@@ -91,7 +91,7 @@ jobs:
             ${{ runner.os }}-${{ matrix.container }}-apphost-cargo-
 
       - name: Setup Rust toolchain
-        if: steps.cache.outputs.cache-hit != 'true'
+        if: ${{ !steps.cache.outputs.cache-hit }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal -y
 
       - name: Build Piton binary

diff --git a/.github/workflows/build-nuget.yml b/.github/workflows/build-nuget.yml
@@ -31,14 +31,14 @@ jobs:
 
     needs: check-apphost-cache
     uses: ./.github/workflows/build-apphost.yml
-    if: needs.check-apphost-cache.outputs.cache-hit != 'true'
+    if: ${{ !needs.check-apphost-cache.outputs.cache-hit }}
 
   cache-apphost-binaries:
     name: Cache built apphost binaries
 
     runs-on: ubuntu-latest
     needs: [check-apphost-cache, build-apphost]
-    if: needs.check-apphost-cache.outputs.cache-hit != 'true'
+    if: ${{ !needs.check-apphost-cache.outputs.cache-hit }}
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -56,7 +56,7 @@ jobs:
 
     runs-on: ubuntu-latest
     needs: [check-apphost-cache, build-apphost]
-    if: needs.check-apphost-cache.outputs.cache-hit == 'true' || needs.build-apphost.result == 'success'
+    if: ${{ !cancelled() && (needs.check-apphost-cache.outputs.cache-hit || needs.build-apphost.result == 'success') }}
     steps:
       - uses: actions/checkout@v4
 
@@ -75,7 +75,7 @@ jobs:
             piton-msbuild-tasks-
 
       - name: Build Piton MSBuild tasks
-        if: steps.cache-msbuild-tasks.outputs.cache-hit != 'true'
+        if: ${{ !steps.cache-msbuild-tasks.outputs.cache-hit }}
         run: dotnet build -c Release -p:TreatWarningsAsErrors=true msbuild
 
       - name: Pack nuget package