Skip to content

Commit db1c5af

Browse files
committed
Auto merge of #4306 - Turbo87:ci-env-vars, r=Turbo87
renovate: Keep `cargo-tarpaulin` and `diesel_cli` automatically up-to-date This works similar to the `RUST_VERSION` updates that we have already configured, but this time using the `crate` datasource, which corresponds to crates.io.
2 parents 4b05cde + 08f8254 commit db1c5af

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

.diesel_version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/renovate.json5

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@
1818
"labels": ["A-backend"],
1919
},
2020
"regexManagers": [
21+
{
22+
"fileMatch": ["^.github/workflows/[^\\.]+\\.ya?ml$"],
23+
"matchStrings": ["CARGO_TARPAULIN_VERSION:\\s*(?<currentValue>.*?)\n"],
24+
"depNameTemplate": "cargo-tarpaulin",
25+
"datasourceTemplate": "crate",
26+
"versioningTemplate": "semver"
27+
},
28+
{
29+
"fileMatch": ["^.github/workflows/[^\\.]+\\.ya?ml$"],
30+
"matchStrings": ["DIESEL_CLI_VERSION:\\s*(?<currentValue>.*?)\n"],
31+
"depNameTemplate": "diesel_cli",
32+
"datasourceTemplate": "crate",
33+
"versioningTemplate": "semver",
34+
},
2135
{
2236
"fileMatch": ["^.github/workflows/[^\\.]+\\.ya?ml$"],
2337
"matchStrings": ["NODE_VERSION:\\s*(?<currentValue>.*?)\n"],

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13+
DIESEL_CLI_VERSION: 1.4.1
1314
NODE_VERSION: 16.13.1
1415
RUST_VERSION: 1.57.0
1516

@@ -137,7 +138,7 @@ jobs:
137138

138139
- name: Setup database
139140
run: |
140-
cargo install diesel_cli --vers $(cat .diesel_version) --no-default-features --features postgres --debug
141+
cargo install diesel_cli --vers ${{ env.DIESEL_CLI_VERSION }} --no-default-features --features postgres --debug
141142
diesel database setup --locked-schema
142143
143144
- name: Run tests

.github/workflows/coverage.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- master
88

99
env:
10+
CARGO_TARPAULIN_VERSION: 0.18.0-alpha.3
11+
DIESEL_CLI_VERSION: 1.4.1
1012
RUST_VERSION: 1.57.0
1113

1214
jobs:
@@ -43,9 +45,9 @@ jobs:
4345
- uses: Swatinem/rust-cache@v1.3.0
4446

4547
# Set up database
46-
- run: cargo install diesel_cli --vers $(cat .diesel_version) --no-default-features --features postgres --debug
48+
- run: cargo install diesel_cli --vers ${{ env.DIESEL_CLI_VERSION }} --no-default-features --features postgres --debug
4749
- run: diesel database setup --locked-schema
4850

4951
# Set up cargo-tarpaulin and run the tests
50-
- run: cargo install cargo-tarpaulin --version ~0.18.0-alpha.3
52+
- run: cargo install cargo-tarpaulin --version ${{ env.CARGO_TARPAULIN_VERSION }}
5153
- run: cargo tarpaulin --avoid-cfg-tarpaulin --workspace

0 commit comments

Comments
 (0)