From 8595fccb27b9799d4c739a0657a3daf22c884d92 Mon Sep 17 00:00:00 2001 From: Matthias Fasching <5011972+fasmat@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:32:35 +0000 Subject: [PATCH] Fix failing systest job not blocking merge (#6658) ## Motivation My previous change in https://github.com/spacemeshos/go-spacemesh/pull/6626 broke `bors merge` to block merging a PR when system tests fail and instead always merged. This should fix this problem. --- .github/workflows/systest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/systest.yml b/.github/workflows/systest.yml index 67a585617d..8dfa4bec14 100644 --- a/.github/workflows/systest.yml +++ b/.github/workflows/systest.yml @@ -173,7 +173,6 @@ jobs: systest-gke: runs-on: ubuntu-22.04 if: ${{ needs.filter-changes.outputs.nondocchanges == 'true' }} - continue-on-error: true needs: - filter-changes - provision-cluster @@ -262,9 +261,10 @@ jobs: delete-pool: runs-on: ubuntu-22.04 - if: ${{ needs.filter-changes.outputs.nondocchanges == 'true' }} + if: ${{ always() && needs.provision-cluster.result == 'success' }} needs: - filter-changes + - provision-cluster - systest-gke timeout-minutes: 20 permissions: