From 6ed1bb99b44a8d76d1e04bafa84d5359d6e7261f Mon Sep 17 00:00:00 2001 From: Laurence Isla Date: Fri, 26 Apr 2024 17:09:36 -0500 Subject: [PATCH 1/2] ci: allow clean ARM server job to execute on v* branches --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2b9cedffd5..58c15d69af 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -486,7 +486,7 @@ jobs: needs: - Build-Cabal-Arm - Release-Docker - if: ${{ always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/rel-')) }} + if: ${{ always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/rel-'), startsWith(github.ref, 'refs/heads/v')) }} runs-on: ubuntu-22.04 env: REMOTE_DIR: ${{ needs.Build-Cabal-Arm.outputs.remotepath }} From f83938e747562850f340d82b0468e6c7804a6137 Mon Sep 17 00:00:00 2001 From: Laurence Isla Date: Mon, 29 Apr 2024 12:19:02 -0500 Subject: [PATCH 2/2] Fix conditional Co-authored-by: Wolfgang Walther --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 58c15d69af..ca1f3cfc81 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -486,7 +486,7 @@ jobs: needs: - Build-Cabal-Arm - Release-Docker - if: ${{ always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/rel-'), startsWith(github.ref, 'refs/heads/v')) }} + if: ${{ always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/v')) }} runs-on: ubuntu-22.04 env: REMOTE_DIR: ${{ needs.Build-Cabal-Arm.outputs.remotepath }}