CI: run teardown steps only if not cancelled

[ci skip]
phusion · Oct 13, 2024 · 0ef9917 · 0ef9917
1 parent 97651ad
commit 0ef9917
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -64,7 +64,7 @@ jobs:
           CONTAINER_NAME: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
           BLOB_NAME: "binaries/linux-binaries-cache-${{ hashFiles('packaging/binaries/linux/docker_image/Dockerfile') }}-${{ matrix.runner }}-${{ matrix.arch }}.tar.zstd"
           CACHE_PATH: packaging/binaries/linux/cache
-        if: always()
+        if: '!cancelled()'
 
       - name: Package
         run: ./package -i output -o output -a "$ARCHITECTURE"
@@ -209,7 +209,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
       - name: Archive configure logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -86,7 +86,7 @@ jobs:
           BLOB_NAME: "binaries/debian-cache-${{ matrix.distro }}-${{ matrix.arch.name }}.tar.zstd"
           CACHE_PATH: packaging/debian/cache
           SUDO: true
-        if: always()
+        if: '!cancelled()'
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,7 +71,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
   cxx-macos:
     name: C++ tests on macOS
@@ -134,7 +134,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
   apache2:
     name: "Apache2 tests on ${{ matrix.name }}"
@@ -253,7 +253,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
 
       - name: Setup sccache as root
@@ -269,7 +269,7 @@ jobs:
 
       - name: Teardown sccache as root
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
         env:
           SUDO: true
 
@@ -366,7 +366,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
   nginx_dynamic:
     name: "Nginx dynamic module tests on ${{ matrix.name }}"
@@ -442,7 +442,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
   standalone:
     name: "Passenger Standalone tests on ${{ matrix.name }}"
@@ -500,7 +500,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
   ruby:
     name: "Ruby tests on ${{ matrix.name }}"
@@ -565,7 +565,7 @@ jobs:
 
       - name: Teardown sccache
         run: ./dev/ci/teardown-sccache
-        if: always()
+        if: '!cancelled()'
 
   nodejs:
     name: "Node.js tests on ${{ matrix.name }}"

diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
@@ -97,7 +97,7 @@ jobs:
           BLOB_NAME: "binaries/rpm-cache-${{ matrix.distro }}-${{ matrix.arch.rpm_arch }}.tar.zstd"
           CACHE_PATH: packaging/rpm/cache
           SUDO: true
-        if: always()
+        if: '!cancelled()'
 
       - uses: actions/upload-artifact@v4
         with: