From ff379cf09db878d089e6793dd46d0f07b71402d5 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Tue, 5 Mar 2024 16:36:58 +0100 Subject: [PATCH 1/2] CI: the seL4/machine_queue repo is public now Signed-off-by: Axel Heider --- .github/workflows/sel4test-hw.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sel4test-hw.yml b/.github/workflows/sel4test-hw.yml index 5b9e100d..0723bfb1 100644 --- a/.github/workflows/sel4test-hw.yml +++ b/.github/workflows/sel4test-hw.yml @@ -80,7 +80,6 @@ jobs: with: repository: seL4/machine_queue path: machine_queue - token: ${{ secrets.PRIV_REPO_TOKEN }} - name: Download image uses: actions/download-artifact@v4 with: From f5268211f0c7d45804f3012ecebefd6aa9d78485 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Tue, 5 Mar 2024 16:43:43 +0100 Subject: [PATCH 2/2] CI: cancel older concurrent PR runs - Remove the space in the workflow name to ensure there are no side effects when using it as an identifier. - Act on PRs only, not on upstreaming. Signed-off-by: Axel Heider --- .github/workflows/sel4test-hw.yml | 7 ++++++- .github/workflows/sel4test-sim.yml | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sel4test-hw.yml b/.github/workflows/sel4test-hw.yml index 0723bfb1..379c4b1b 100644 --- a/.github/workflows/sel4test-hw.yml +++ b/.github/workflows/sel4test-hw.yml @@ -6,7 +6,7 @@ # # See sel4test-hw/builds.yml in the repo seL4/ci-actions for configs. -name: seL4Test HW +name: seL4Test-HW on: # needs PR target for secrets access; guard by requiring label @@ -17,6 +17,11 @@ on: permissions: contents: read +# Cancel older runs to reduce the load, especially on the machine queue. +concurrency: + group: ${{ github.workflow }}-pr-${{ github.event.number }} + cancel-in-progress: true + jobs: hw-build: name: HW Build diff --git a/.github/workflows/sel4test-sim.yml b/.github/workflows/sel4test-sim.yml index 19466192..402c686f 100644 --- a/.github/workflows/sel4test-sim.yml +++ b/.github/workflows/sel4test-sim.yml @@ -6,13 +6,20 @@ # # See sel4test-sim/builds.yml in the repo seL4/ci-actions for configs. -name: seL4Test Sim +name: seL4Test-Sim on: push: branches: [master] pull_request: +# Cancel older runs to reduce the load. The workflow also runs on pushes to +# the master brnach, but skipping or cancellation will not happen there +# practically due to the unique run ID. +concurrency: + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || format('run-{0}', github.run_id) }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: simulation: name: Simulation