Merge branch 'main' into upgrade-check

rustic-rs · Oct 2, 2024 · b8f0a3a · b8f0a3a
2 parents d5c5de7 + 238ae99
commit b8f0a3a
Show file tree

Hide file tree

Showing 57 changed files with 3,406 additions and 1,924 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
@@ -3,4 +3,8 @@ 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,54 +1,4 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-        "config:recommended",
-        ":dependencyDashboard",
-        "helpers:pinGitHubActionDigests"
-    ],
-    "separateMinorPatch": false,
-    "prHourlyLimit": 1,
-    "prConcurrentLimit": 1,
-    "rebaseConflictedPrs": false,
-    "rebaseStalePrs": false,
-    "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
@@ -31,7 +31,7 @@ jobs:
         with:
           toolchain: stable
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
-      - uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1.4.1
+      - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           ignore: RUSTSEC-2023-0071  # rsa thingy, ignored for now
@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
-      - uses: EmbarkStudios/cargo-deny-action@2fad0807be2b6f4402fd9dd4225aa4e91b9ad879 # v1
+      - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # v2
         with:
           command: check bans licenses sources
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -112,6 +112,7 @@ jobs:
           sign-release: true
           hash-release: true
           use-project-version: true
+          extra-cargo-build-args: --features self-update
 
   publish-nightly:
     if: ${{ github.repository_owner == 'rustic-rs' && github.ref == 'refs/heads/main' }}

diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml
@@ -4,9 +4,9 @@ on:
   push:
     tags:
       # Run on stable releases
-      - 'v*.*.*'
+      - "v*.*.*"
       # Run on release candidates
-      - 'v*.*.*-rc*'
+      - "v*.*.*-rc*"
 
 defaults:
   run:
@@ -96,7 +96,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
-
           fetch-depth: 0 # fetch all history so that git describe works
       - name: Create binary artifact
         uses: rustic-rs/create-binary-artifact-action@main # dev
@@ -118,6 +117,7 @@ jobs:
           hash-release: true
           use-project-version: true
           use-tag-version: true # IMPORTANT: this is being used to make sure the tag that is built is in the archive filename, so automation can download the correct version
+          extra-cargo-build-args: --features self-update
 
   create-release:
     name: Creating release with artifacts
@@ -134,7 +134,7 @@ jobs:
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
 
       - name: Creating Release
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2
         with:
           discussion_category_name: "Announcements"
           draft: true

diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
@@ -0,0 +1,36 @@
+name: Release-plz
+
+permissions:
+  pull-requests: write
+  contents: write
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-plz:
+    name: Release-plz
+    if: ${{ github.repository_owner == 'rustic-rs' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate GitHub token
+        uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1
+        id: generate-token
+        with:
+          app-id: ${{ secrets.RELEASE_PLZ_APP_ID }}
+          private-key: ${{ secrets.RELEASE_PLZ_APP_PRIVATE_KEY }}
+      - name: Checkout repository
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.generate-token.outputs.token }}
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run release-plz
+        uses: MarcoIeni/release-plz-action@91356927c5ac06a27d9342861ff6e234210d56b4 # v0.5
+        env:
+          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,109 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.0](https://github.com/rustic-rs/rustic/compare/v0.8.1...v0.9.0) - 2024-09-29
+
+### Bug Fixes
+
+- [**breaking**] use multiple options only as array in config profile
+  ([#1240](https://github.com/rustic-rs/rustic/pull/1240))
+- Allow snapshots to be modified and marked to forget
+  ([#1253](https://github.com/rustic-rs/rustic/pull/1253))
+- make ls and find show the year of mtime date
+  ([#1249](https://github.com/rustic-rs/rustic/pull/1249))
+- ls: Remove printing trailing space
+  ([#1247](https://github.com/rustic-rs/rustic/pull/1247))
+- webdav/forget: correctly use application config
+  ([#1241](https://github.com/rustic-rs/rustic/pull/1241))
+
+### Features
+
+- [**breaking**] copy: Use config profile as target
+  ([#1131](https://github.com/rustic-rs/rustic/pull/1131))
+- backup: Add option `stdin-command` 
+  ([rustic_core](https://github.com/rustic-rs/rustic_core/releases/tag/rustic_core-v0.3.0))
+- Add list indexpacks and list indexcontent commands
+  ([#1254](https://github.com/rustic-rs/rustic/pull/1254))
+- Add option `--only-identical` for `diff` to allow for bitrot check
+  ([#1250](https://github.com/rustic-rs/rustic/pull/1250))
+- ls: Add option --json ([#1251](https://github.com/rustic-rs/rustic/pull/1251))
+- backup: Add option `--long`
+  ([#1159](https://github.com/rustic-rs/rustic/pull/1159))
+
+### Documentation
+
+- update installation instructions in readme to use `--locked` flag for install
+  from crates.io
+- update RepositoryErrorKind rustdoc following rustic_core change
+  ([#1237](https://github.com/rustic-rs/rustic/pull/1237))
+
+### Other
+
+- Remove self-update from default crate features
+  ([#1139](https://github.com/rustic-rs/rustic/pull/1139))
+- Reduce memory usage of restore
+  ([#1069](https://github.com/rustic-rs/rustic/pull/1069))
+- *(deps)* update rust crate libc to v0.2.159
+  ([#1257](https://github.com/rustic-rs/rustic/pull/1257))
+- *(deps)* lock file maintenance
+  ([#1269](https://github.com/rustic-rs/rustic/pull/1269))
+- *(deps)* update rust crate rstest to 0.23
+  ([#1267](https://github.com/rustic-rs/rustic/pull/1267))
+- *(deps)* update rust crate tempfile to v3.13.0
+  ([#1266](https://github.com/rustic-rs/rustic/pull/1266))
+- *(deps)* update marcoieni/release-plz-action digest to 8b0f89a
+  ([#1265](https://github.com/rustic-rs/rustic/pull/1265))
+- *(deps)* update embarkstudios/cargo-deny-action action to v2
+  ([#1259](https://github.com/rustic-rs/rustic/pull/1259))
+- *(deps)* update rustsec/audit-check action to v2
+  ([#1260](https://github.com/rustic-rs/rustic/pull/1260))
+- *(deps)* update softprops/action-gh-release action to v2
+  ([#1258](https://github.com/rustic-rs/rustic/pull/1258))
+- *(deps)* update embarkstudios/cargo-deny-action digest to 3f4a782
+  ([#1228](https://github.com/rustic-rs/rustic/pull/1228))
+
+## [0.8.1] - 2024-09-08
+
+### Bug Fixes
+
+- Allow to compile without tui feature
+  ([#1208](https://github.com/rustic-rs/rustic/issues/1208))
+- Use cargo --locked in CI pipeline
+  ([#1207](https://github.com/rustic-rs/rustic/issues/1207))
+- Return exitcode ([#1220](https://github.com/rustic-rs/rustic/issues/1220))
+- "Incorrect Password" error is now only shown if password is really incorrect.
+  ([rustic_core](https://github.com/rustic-rs/rustic_core/releases/tag/rustic_core-v0.3.1))
+- Group by now works as expected
+  ([rustic_core](https://github.com/rustic-rs/rustic_core/releases/tag/rustic_core-v0.3.1))
+- A bug in `keep-tags` and `filter-tags` has been fixed.
+  ([rustic_core](https://github.com/rustic-rs/rustic_core/releases/tag/rustic_core-v0.3.1))
+- Building OpenBSD platform target is now possible again
+  ([rustic_core](https://github.com/rustic-rs/rustic_core/releases/tag/rustic_core-v0.3.1))
+
+### Documentation
+
+- Update config profile readme
+  ([#1221](https://github.com/rustic-rs/rustic/issues/1221))
+
+### Features
+
+- Add autocompletion hints
+  ([#1225](https://github.com/rustic-rs/rustic/issues/1225))
+- Allow to modify filters
+  ([#1210](https://github.com/rustic-rs/rustic/issues/1210))
+- Allow to view text files
+  ([#1216](https://github.com/rustic-rs/rustic/issues/1216))
+
+### Generated
+
+- Updated Completions fixtures
+
+### Miscellaneous Tasks
+
+- Bump quinn-proto from 0.11.6 to 0.11.8
+  ([#1223](https://github.com/rustic-rs/rustic/issues/1223))
+- Dependency updates ([#1227](https://github.com/rustic-rs/rustic/issues/1227))
+
 ## [0.8.0] - 2024-08-21
 
 ### Bug Fixes