Merge branch 'main' into feature/axum

rustic-rs · Mar 15, 2024 · 3114a64 · 3114a64
2 parents f72629e + 5fec1d1
commit 3114a64
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 0 deletions.
diff --git 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
     },

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -14,6 +14,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
@@ -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
@@ -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 }}
@@ -88,6 +92,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)

diff --git 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
@@ -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
@@ -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