Skip to content

Commit 3e78f7b

Browse files
committed
ci: simplify setting target rust versions for build matrix
1 parent 74d4a8f commit 3e78f7b

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/bugbite-cli.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
outputs:
3535
version: ${{ steps.msrv.outputs.version }}
3636
steps:
37-
- name: Checkout code to determine the minimum supported rust version
37+
- name: Checkout code
3838
uses: actions/checkout@v4
3939

4040
- name: Get the minimum supported rust version (MSRV)
4141
id: msrv
4242
run: |
43-
min_ver=$(sed -rn '/^rust-version\s*=/ s/^.*=\s*"([0-9](\.[0-9]+)+)(.*)/\1/p' Cargo.toml)
44-
if [[ -n ${min_ver} ]]; then
45-
echo "version=${min_ver}" >> $GITHUB_OUTPUT
43+
version=$(sed -rn '/^rust-version\s*=/ s/^.*=\s*"([0-9](\.[0-9]+)+)(.*)/\1/p' Cargo.toml)
44+
if [[ -n ${version} ]]; then
45+
echo "version=${version}" >> $GITHUB_OUTPUT
4646
else
4747
exit 1
4848
fi

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ on:
1515
- "crates/*/src/**"
1616

1717
jobs:
18-
setup:
18+
msrv:
1919
runs-on: ubuntu-latest
2020
outputs:
21-
rust-version: ${{ steps.vars.outputs.rust-version }}
21+
version: ${{ steps.msrv.outputs.version }}
2222
steps:
23-
- name: Checkout code to determine the minimum supported rust version
23+
- name: Checkout code
2424
uses: actions/checkout@v4
2525

26-
- name: Set rust versions to test against
27-
id: vars
26+
- name: Get the minimum supported rust version (MSRV)
27+
id: msrv
2828
run: |
29-
min_ver=$(sed -rn '/^rust-version\s*=/ s/^.*=\s*"([0-9](\.[0-9]+)+)(.*)/\1/p' Cargo.toml)
30-
if [[ -n ${min_ver} ]]; then
31-
echo "rust-version=['${min_ver}', 'stable']" >> $GITHUB_OUTPUT
29+
version=$(sed -rn '/^rust-version\s*=/ s/^.*=\s*"([0-9](\.[0-9]+)+)(.*)/\1/p' Cargo.toml)
30+
if [[ -n ${version} ]]; then
31+
echo "version=${version}" >> $GITHUB_OUTPUT
3232
else
3333
exit 1
3434
fi
3535
3636
test:
37-
needs: setup
37+
needs: msrv
3838
runs-on: ${{ matrix.os }}
3939
strategy:
4040
matrix:
4141
os: [ubuntu-latest]
42-
rust-version: ${{ fromJson(needs.setup.outputs.rust-version) }}
42+
rust-version: [${{ needs.msrv.outputs.version }}, stable]
4343
include:
4444
- os: macos-latest
4545
rust-version: stable

0 commit comments

Comments
 (0)