From bd34d328a88b58a7bfcb8182dd39e5a7087ddd76 Mon Sep 17 00:00:00 2001
From: simonsan <14062932+simonsan@users.noreply.github.com>
Date: Sun, 4 Feb 2024 22:09:55 +0100
Subject: [PATCH 1/3] ci: add project-cache-key for better caching in ci

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
---
 .github/workflows/cross-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml
index aba4bce..f4e707f 100644
--- a/.github/workflows/cross-ci.yml
+++ b/.github/workflows/cross-ci.yml
@@ -88,6 +88,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.job.target }}
           use-cross: ${{ matrix.job.use-cross }}
+          project-cache-key: "rustic_server"
 
   result:
     name: Result (Cross-CI)

From 9897ea2b318bad20d134f74a6c2ba839a664495b Mon Sep 17 00:00:00 2001
From: simonsan <14062932+simonsan@users.noreply.github.com>
Date: Sun, 4 Feb 2024 22:11:01 +0100
Subject: [PATCH 2/3] ci: don't let renovate rebase PRs to circumvent resource
 exhaustion issues

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
---
 .github/renovate.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index 8eb6fdc..f8fe254 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -8,6 +8,8 @@
     "separateMinorPatch": false,
     "prHourlyLimit": 1,
     "prConcurrentLimit": 1,
+    "rebaseConflictedPrs": false,
+    "rebaseStalePrs": false,
     "major": {
         "dependencyDashboardApproval": true
     },

From 5fec1d1a99f66e4f545542622d113a95ece4321d Mon Sep 17 00:00:00 2001
From: simonsan <14062932+simonsan@users.noreply.github.com>
Date: Sun, 18 Feb 2024 00:14:11 +0100
Subject: [PATCH 3/3] ci: break old ci jobs when new commits are pushed so we
 don't fill up the queue

If new code is pushed to a PR branch, then cancel in progress workflows for that PR. Ensures that we don't waste CI time, and returns results quicker.

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
---
 .github/workflows/audit.yml       | 4 ++++
 .github/workflows/ci.yml          | 4 ++++
 .github/workflows/cross-ci.yml    | 4 ++++
 .github/workflows/lint-docs.yml   | 4 ++++
 .github/workflows/prebuilt-pr.yml | 4 ++++
 .github/workflows/release-ci.yml  | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index cdfeaf3..0c5070d 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -15,6 +15,10 @@ on:
   # merge_group:
   #     types: [checks_requested]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   audit:
     if: ${{ github.repository_owner == 'rustic-rs' }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4a1b96..3743389 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,10 @@ on:
   merge_group:
     types: [checks_requested]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   fmt:
     name: Rustfmt
diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml
index f4e707f..ad4d5b0 100644
--- a/.github/workflows/cross-ci.yml
+++ b/.github/workflows/cross-ci.yml
@@ -18,6 +18,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   cross-check:
     name: Cross checking ${{ matrix.job.target }}
diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
index 266a0ee..67a6d71 100644
--- a/.github/workflows/lint-docs.yml
+++ b/.github/workflows/lint-docs.yml
@@ -7,6 +7,10 @@ on:
   merge_group:
     types: [checks_requested]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   style:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/prebuilt-pr.yml b/.github/workflows/prebuilt-pr.yml
index a6f317e..2ccf653 100644
--- a/.github/workflows/prebuilt-pr.yml
+++ b/.github/workflows/prebuilt-pr.yml
@@ -13,6 +13,10 @@ on:
 env:
   BINARY_NAME: rustic-server
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pr-build:
     if: ${{ github.event.label.name == 'S-build' && github.repository_owner == 'rustic-rs' }}
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
index 1433cae..eb87e81 100644
--- a/.github/workflows/release-ci.yml
+++ b/.github/workflows/release-ci.yml
@@ -14,6 +14,10 @@ on:
   #       options:
   #         - rustic_server
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   determine-package:
     name: Determine package to release