From b00bb05b6be4bcbb3cc95d0b1e773e19c84555b5 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Thu, 12 Dec 2024 11:56:40 +0100 Subject: [PATCH] CI: Refactor branch matching in jobs Matching `master` can be a bit simpler and prevent invoking the job altogether. Additionally, we don't need an `always()` here: we don't have job dependencies and we want these jobs to be cancelable. --- .github/workflows/ladybird-js-artifacts.yml | 6 ++++-- .github/workflows/libjs-test262.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ladybird-js-artifacts.yml b/.github/workflows/ladybird-js-artifacts.yml index 5c9d286fd88..64155754eb5 100644 --- a/.github/workflows/ladybird-js-artifacts.yml +++ b/.github/workflows/ladybird-js-artifacts.yml @@ -1,6 +1,8 @@ name: Package the js repl as a binary artifact -on: [push] +on: + push: + branches: [master] env: LADYBIRD_SOURCE_DIR: ${{ github.workspace }} @@ -11,7 +13,7 @@ env: jobs: build-and-package: runs-on: ${{ matrix.os }} - if: always() && github.repository == 'LadybirdBrowser/ladybird' && github.ref == 'refs/heads/master' + if: github.repository == 'LadybirdBrowser/ladybird' strategy: fail-fast: false matrix: diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index 6a3b07610ac..14283a487b0 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -1,6 +1,8 @@ name: Run test262 and test-wasm -on: [push] +on: + push: + branches: [master] env: LADYBIRD_SOURCE_DIR: ${{ github.workspace }} @@ -9,7 +11,7 @@ env: jobs: run_and_update_results: runs-on: test262-runner - if: always() && github.repository == 'LadybirdBrowser/ladybird' && github.ref == 'refs/heads/master' + if: github.repository == 'LadybirdBrowser/ladybird' concurrency: libjs-test262