From 53ac6b2a9032e11803238b99dfca01f6089156c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 25 Mar 2024 16:20:21 +0100 Subject: [PATCH 1/3] ci: trigger with merge groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 774f3f4..e2c6fd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: CI on: push: pull_request: + merge_group: jobs: fmt: From 3c61e2d567067a436baecb3e2afe0e06b961a08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 25 Mar 2024 16:21:11 +0100 Subject: [PATCH 2/3] ci: save cache only on main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2c6fd1..c14881e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,8 @@ jobs: toolchain: nightly-2023-11-01 components: llvm-tools - uses: Swatinem/rust-cache@v2 + with: + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Build run: make - name: Run @@ -63,6 +65,8 @@ jobs: toolchain: nightly-2023-11-01 components: llvm-tools - uses: Swatinem/rust-cache@v2 + with: + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Build run: cargo +nightly-2023-11-01 rustc -- -Zinstrument-mcount -C passes="ee-instrument" - name: Run From cdd07b39804cc5229e7b62cd3ffb4ac37b879a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 25 Mar 2024 16:21:42 +0100 Subject: [PATCH 3/3] ci: run pushes only on main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c14881e..a1e9f47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,8 @@ name: CI on: push: + branches: + - main pull_request: merge_group: