Skip to content

Commit 23c1447

Browse files
committed
Merge remote-tracking branch 'origin/master' into define-admins
2 parents bfa3c78 + f971a2e commit 23c1447

35 files changed

+1320
-1168
lines changed

.buildpacks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
https://github.com/unfold/heroku-buildpack-pnpm#b8dcee8
22
https://github.com/heroku/heroku-buildpack-nginx#760407b
3-
https://github.com/emk/heroku-buildpack-rust#cfa0f06
3+
https://github.com/Turbo87/heroku-buildpack-rust#30429b2

.github/renovate.json5

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
}, {
2626
"matchPackageNames": ["@percy/cli", "tj-actions/changed-files", "webpack"],
2727
"extends": ["schedule:weekly"],
28+
}, {
29+
// Avoid "Artifact update problem" for pnpm updates when the renovatebot
30+
// setup does not support the new version yet.
31+
"matchPackageNames": ["pnpm"],
32+
"minimumReleaseAge": "24 hours"
2833
}, {
2934
"matchLanguages": ["js"],
3035
"matchUpdateTypes": ["lockFileMaintenance"],

.github/workflows/ci.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
# renovate: datasource=crate depName=diesel_cli versioning=semver
1919
DIESEL_CLI_VERSION: 2.0.1
2020
# renovate: datasource=npm depName=pnpm
21-
PNPM_VERSION: 8.5.0
21+
PNPM_VERSION: 8.5.1
2222

2323
jobs:
2424
changed-files:
@@ -80,7 +80,7 @@ jobs:
8080
- run: rustup component add rustfmt
8181
- run: rustup component add clippy
8282

83-
- uses: Swatinem/rust-cache@v2.2.1
83+
- uses: Swatinem/rust-cache@v2.3.0
8484

8585
- run: cargo fmt --check
8686
- run: cargo clippy --all-targets --all-features --all
@@ -89,15 +89,12 @@ jobs:
8989
name: Backend / cargo-deny
9090
runs-on: ubuntu-22.04
9191
needs: changed-files
92-
if: needs.changed-files.outputs.rust-lockfile == 'true'
93-
94-
env:
95-
RUSTFLAGS: "-D warnings"
92+
if: github.event_name != 'pull_request' || needs.changed-files.outputs.rust-lockfile == 'true'
9693

9794
steps:
9895
- uses: actions/[email protected]
9996

100-
- uses: Swatinem/rust-cache@v2.2.1
97+
- uses: Swatinem/rust-cache@v2.3.0
10198

10299
- run: cargo install cargo-deny --vers ${{ env.CARGO_DENY_VERSION }}
103100
- run: cargo deny check
@@ -132,7 +129,7 @@ jobs:
132129
steps:
133130
- uses: actions/[email protected]
134131

135-
- uses: Swatinem/rust-cache@v2.2.1
132+
- uses: Swatinem/rust-cache@v2.3.0
136133

137134
- run: cargo install diesel_cli --vers ${{ env.DIESEL_CLI_VERSION }} --no-default-features --features postgres --debug
138135
- run: diesel database setup --locked-schema

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Set up Rust
4747
- run: rustup default ${{ env.RUST_VERSION }}
48-
- uses: Swatinem/rust-cache@v2.2.1
48+
- uses: Swatinem/rust-cache@v2.3.0
4949

5050
# Set up database
5151
- run: cargo install diesel_cli --vers ${{ env.DIESEL_CLI_VERSION }} --no-default-features --features postgres --debug

0 commit comments

Comments
 (0)