Skip to content

Commit db6d3ab

Browse files
authored
Merge branch 'ttytm:main' into main
2 parents 3370a56 + 86fba7f commit db6d3ab

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

.github/workflows/lint.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,19 @@ jobs:
3535
- uses: actions/checkout@v4
3636
- name: Setup dependencies
3737
run: |
38-
# Setup latest jq
39-
curl -Lo jq https://github.com/jqlang/jq/releases/latest/download/jq-linux-amd64
40-
chmod +x jq
4138
# Setup cargo msrv
42-
cargo_msrv="cargo-msrv-x86_64-unknown-linux-gnu-v0.16.0-beta.22"
43-
curl -Lo "$cargo_msrv".tgz https://github.com/foresterre/cargo-msrv/releases/download/v0.16.0-beta.22/"$cargo_msrv".tgz
44-
tar -xvf "$cargo_msrv".tgz
45-
mv "$cargo_msrv"/cargo-msrv ./
39+
version=v0.16.2
40+
artifact="cargo-msrv-x86_64-unknown-linux-gnu-$version"
41+
curl -LO "https://github.com/foresterre/cargo-msrv/releases/download/$version/$artifact.tgz"
42+
tar -xvf "$artifact.tgz"
43+
mv "${artifact}/cargo-msrv" ./
4644
- name: Detect MSRV changes
4745
run: |
48-
defined_msrv="$(./cargo-msrv show --output-format json 2>&1 | ./jq -r '.result.version' | tail -n 1)"
49-
dependency_msrv="$(./cargo-msrv list --output-format json 2>&1 | ./jq -r '.result.list.[0].msrv' | tail -n 1)"
46+
defined_msrv="$(./cargo-msrv show --output-format json 2>&1 | jq -r '.result.version' | tail -n 1)"
47+
dependency_msrv="$(./cargo-msrv list --output-format json 2>&1 | jq -r '.result.list[0].msrv' | tail -n 1)"
5048
echo "defined_msrv=$defined_msrv"
5149
echo "dependency_msrv=$dependency_msrv"
52-
if [ "$defined_msrv" != "$dependency_msrv" ]; then
50+
if [ "${defined_msrv:?}" != "${dependency_msrv:?}" ]; then
5351
echo "::error::MSRV changed | defined: '$defined_msrv', absolute: '$dependency_msrv'"
5452
exit 1
5553
fi

.github/workflows/tarpaulin.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: cargo
24-
uses: taiki-e/install-action@v2.44.58
24+
uses: taiki-e/install-action@v2
2525
with:
2626
tool: cargo-tarpaulin
2727

2828
- name: python
29-
uses: actions/setup-python@v5.3.0
29+
uses: actions/setup-python@v5
3030
with:
3131
python-version: 3.11
3232

3333
- name: checkout
34-
uses: actions/checkout@v4.2.2
34+
uses: actions/checkout@v4
3535
with:
3636
ref: ${{ github.head_ref }}
3737
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -40,7 +40,7 @@ jobs:
4040
run: echo pycobertura >> requirements.txt
4141

4242
- name: dependencies
43-
uses: py-actions/py-dependency-install@v4.1.0
43+
uses: py-actions/py-dependency-install@v4
4444

4545
- name: tarpaulin
4646
run: |
@@ -50,7 +50,7 @@ jobs:
5050
&& echo '```' >> message.txt
5151
5252
- name: comment
53-
uses: thollander/actions-comment-pull-request@v3.0.0
53+
uses: thollander/actions-comment-pull-request@v3
5454
with:
5555
comment-tag: tarpaulin
5656
file-path: message.txt

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)