Merge branch 'main' into simonsan-patch-1

rustic-rs · Nov 12, 2024 · f7509ad · f7509ad
2 parents eae38aa + 62f6087
commit f7509ad
Show file tree

Hide file tree

Showing 150 changed files with 15,647 additions and 5,468 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
@@ -0,0 +1,10 @@
+[advisories]
+ignore = [
+  # FIXME!: See https://github.com/RustCrypto/RSA/issues/19#issuecomment-1822995643.
+  # There is no workaround available yet.
+  "RUSTSEC-2023-0071",
+  # FIXME!: proc-macro-error's maintainer seems to be unreachable, we use `merge` which is using this.
+  # `merge` is self-hosted on another platform, we should check if and how to replace it/open upstream
+  # issue for updating the dependency.
+  "RUSTSEC-2024-0370",
+]
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,52 +1,4 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-        "config:recommended",
-        ":dependencyDashboard",
-        "helpers:pinGitHubActionDigests"
-    ],
-    "separateMinorPatch": false,
-    "prHourlyLimit": 1,
-    "prConcurrentLimit": 1,
-    "major": {
-        "dependencyDashboardApproval": true
-    },
-    "labels": [
-        "A-dependencies"
-    ],
-    "packageRules": [
-        {
-            "description": "Automerge pin updates for GitHub Actions",
-            "matchDatasources": [
-                "github-actions"
-            ],
-            "matchDepTypes": [
-                "action"
-            ],
-            "matchUpdateTypes": [
-                "pin",
-                "digest",
-                "pinDigest"
-            ],
-            "labels": [
-                "A-ci"
-            ],
-            "automerge": true
-        },
-        {
-            "matchDatasources": [
-                "cargo"
-            ],
-            "extends": [
-                "schedule:weekly"
-            ]
-        }
-    ],
-    "lockFileMaintenance": {
-        "enabled": true,
-        "automerge": true,
-        "extends": [
-            "schedule:monthly"
-        ]
-    }
+    "extends": ["local>rustic-rs/.github:renovate-config"]
 }
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -14,31 +14,36 @@ 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' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       # Ensure that the latest version of Cargo is installed
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1
         with:
           toolchain: stable
-      - uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
-      - uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1.4.1
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
+      - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          ignore: RUSTSEC-2023-0071  # rsa thingy, ignored for now
 
   cargo-deny:
     name: Run cargo-deny
     if: ${{ github.repository_owner == 'rustic-rs' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - uses: EmbarkStudios/cargo-deny-action@1e59595bed8fc55c969333d08d7817b36888f0c5 # v1
+      - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # v2
         with:
           command: check bans licenses sources
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,16 @@ on:
   merge_group:
     types: [checks_requested]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1
         with:
@@ -34,36 +38,36 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        feature: [default]
+        feature: [release]
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1
         with:
           toolchain: stable
           components: clippy
-      - uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
       - name: Run clippy
-        run: cargo clippy --all-targets --features ${{ matrix.feature }} -- -D warnings
+        run: cargo clippy --locked --all-targets --features ${{ matrix.feature }} -- -D warnings
 
   test:
     name: Test
     runs-on: ${{ matrix.job.os }}
     strategy:
       matrix:
         rust: [stable]
-        feature: [default]
+        feature: [release]
         job:
           - os: macos-latest
           - os: ubuntu-latest
           - os: windows-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         if: github.event_name != 'pull_request'
         with:
           fetch-depth: 0
 
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -73,7 +77,7 @@ jobs:
         uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1
         with:
           toolchain: stable
-      - uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
       - name: Run Cargo Test
         run: cargo test -r --all-targets --features ${{ matrix.feature }} --workspace
 
@@ -88,12 +92,12 @@ jobs:
           - os: ubuntu-latest
           - os: windows-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         if: github.event_name != 'pull_request'
         with:
           fetch-depth: 0
 
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -103,7 +107,7 @@ jobs:
         uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1
         with:
           toolchain: stable
-      - uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
+      - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
       - name: Run Cargo Doc
         run: cargo doc --no-deps --all-features --workspace --examples
 

diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml
@@ -7,8 +7,6 @@ on:
   push:
     branches:
       - main
-      - "renovate/**"
-      - "release/**"
     paths-ignore:
       - "**/*.md"
   merge_group:
@@ -18,6 +16,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 }}
@@ -26,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         rust: [stable]
-        feature: [default]
+        feature: [release]
         job:
           - os: windows-latest
             os-name: windows
@@ -38,7 +40,7 @@ jobs:
             target: x86_64-pc-windows-gnu
             architecture: x86_64
             use-cross: false
-          - os: macos-latest
+          - os: macos-13
             os-name: macos
             target: x86_64-apple-darwin
             architecture: x86_64
@@ -63,6 +65,11 @@ jobs:
             target: aarch64-unknown-linux-gnu
             architecture: arm64
             use-cross: true
+          - os: ubuntu-latest
+            os-name: linux
+            target: aarch64-unknown-linux-musl
+            architecture: arm64
+            use-cross: true
           - os: ubuntu-latest
             os-name: linux
             target: i686-unknown-linux-gnu
@@ -81,7 +88,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Run Cross-CI action
         uses: rustic-rs/cross-ci-action@main

diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
@@ -7,11 +7,15 @@ 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
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - uses: dprint/check@2f1cf31537886c3bfb05591c031f7744e48ba8a1 # v2.2
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -37,7 +37,7 @@ jobs:
             architecture: x86_64
             binary-postfix: ".exe"
             use-cross: false
-          - os: macos-latest
+          - os: macos-13
             os-name: macos
             target: x86_64-apple-darwin
             architecture: x86_64
@@ -67,6 +67,12 @@ jobs:
             architecture: arm64
             binary-postfix: ""
             use-cross: true
+          - os: ubuntu-latest
+            os-name: linux
+            target: aarch64-unknown-linux-musl
+            architecture: arm64
+            binary-postfix: ""
+            use-cross: true
           - os: ubuntu-latest
             os-name: linux
             target: i686-unknown-linux-gnu
@@ -89,7 +95,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0 # fetch all history so that git describe works
       - name: Create binary artifact
@@ -120,7 +126,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
       - name: Releasing nightly builds
         shell: bash
         run: |
@@ -148,7 +154,7 @@ jobs:
           mkdir -p $WORKING_DIR/$DEST_DIR
 
           # do the copy
-          for i in binary-*; do cp -a $i/* $WORKING_DIR/$DEST_DIR; done
+          for artifact_dir in binary-*; do cp -a $artifact_dir/* $WORKING_DIR/$DEST_DIR; done
 
           # create the commit
           cd $WORKING_DIR

diff --git a/.github/workflows/prebuilt-pr.yml b/.github/workflows/prebuilt-pr.yml
@@ -10,6 +10,10 @@ on:
       - "docs/**/*"
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
   BINARY_NAME: rustic
 
@@ -79,7 +83,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0 # fetch all history so that git describe works
       - name: Create binary artifact