Merge branch 'master' into color_for_recent_publish_date

Author: root

.github/renovate.json5

@@ -11,22 +11,14 @@
         ":automergeTesters",
         "regexManagers:dockerfileVersions",
         "regexManagers:githubActionsVersions",
+        "github>Turbo87/renovate-config//rust/updateToolchain",
     ],
     "js": {
         "labels": ["A-frontend 🐹"],
     },
     "rust": {
         "labels": ["A-backend ⚙️"],
     },
-    "regexManagers": [
-        {
-            "fileMatch": ["^RustConfig$"],
-            "matchStrings": ["VERSION=(?<currentValue>.*?)\n"],
-            "depNameTemplate": "rust",
-            "datasourceTemplate": "github-releases",
-            "lookupNameTemplate": "rust-lang/rust",
-        }
-    ],
     "packageRules": [{
         "matchPackageNames": ["ember-cli", "ember-data", "ember-source"],
         "separateMinorPatch": true,
@@ -48,13 +40,6 @@
         "matchPackageNames": ["rust"],
         "commitMessageTopic": "Rust",
         "labels": ["A-backend ⚙️"],
-    }, {
-        "matchPackagePatterns": [
-            "^conduit$",
-            "^conduit-",
-            "^sentry-conduit$",
-        ],
-        "groupName": "conduit packages",
     }, {
         "matchPackagePatterns": [
             "^diesel$",

.github/workflows/ci.yml

@@ -13,12 +13,12 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # renovate: datasource=crate depName=cargo-deny versioning=semver
+  CARGO_DENY_VERSION: 0.13.9
   # renovate: datasource=crate depName=diesel_cli versioning=semver
   DIESEL_CLI_VERSION: 2.0.1
   # renovate: datasource=npm depName=pnpm
-  PNPM_VERSION: 8.4.0
-  # renovate: datasource=github-releases depName=rust lookupName=rust-lang/rust
-  RUST_VERSION: 1.69.0
+  PNPM_VERSION: 8.5.0
 
 jobs:
   changed-files:
@@ -48,18 +48,22 @@ jobs:
         with:
           files_ignore: |
             cargo-registry-*/**
-            conduit/**
-            conduit-*/**
             migrations/**
             src/**
             build.rs
             Cargo.lock
             Cargo.toml
-            RustConfig
+            rust-toolchain.toml
+
+      - uses: tj-actions/[email protected]
+        id: changed-files-rust-lockfile
+        with:
+          files: Cargo.lock
 
     outputs:
       non-js: ${{ steps.changed-files-non-js.outputs.any_modified }}
       non-rust: ${{ steps.changed-files-non-rust.outputs.any_modified }}
+      rust-lockfile: ${{ steps.changed-files-rust-lockfile.outputs.any_modified }}
 
   backend-lint:
     name: Backend / Lint
@@ -73,7 +77,6 @@ jobs:
     steps:
       - uses: actions/[email protected]
 
-      - run: rustup default ${{ env.RUST_VERSION }}
       - run: rustup component add rustfmt
       - run: rustup component add clippy
 
@@ -82,6 +85,23 @@ jobs:
       - run: cargo fmt --check
       - run: cargo clippy --all-targets --all-features --all
 
+  backend-cargo-deny:
+    name: Backend / cargo-deny
+    runs-on: ubuntu-22.04
+    needs: changed-files
+    if: needs.changed-files.outputs.rust-lockfile == 'true'
+
+    env:
+      RUSTFLAGS: "-D warnings"
+
+    steps:
+      - uses: actions/[email protected]
+
+      - uses: Swatinem/[email protected]
+
+      - run: cargo install cargo-deny --vers ${{ env.CARGO_DENY_VERSION }}
+      - run: cargo deny check
+
   backend-test:
     name: Backend / Test
     runs-on: ubuntu-22.04
@@ -112,8 +132,6 @@ jobs:
     steps:
       - uses: actions/[email protected]
 
-      - run: rustup default ${{ env.RUST_VERSION }}
-
       - uses: Swatinem/[email protected]
 
       - run: cargo install diesel_cli --vers ${{ env.DIESEL_CLI_VERSION }} --no-default-features --features postgres --debug