Skip to content

Commit 47030ce

Browse files
committed
fix(ci): use rust toolchain 1.87
1 parent 0b5714f commit 47030ce

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

.github/workflows/daily_loc.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@ jobs:
1313
steps:
1414
- name: Checkout sources
1515
uses: actions/checkout@v4
16-
- name: Setup Rust Environment
17-
uses: ./.github/actions/setup-rust
16+
- name: Rustup toolchain install
17+
uses: dtolnay/rust-toolchain@master
18+
with:
19+
toolchain: 1.87.0
20+
components: rustfmt, clippy
21+
22+
- name: Add Rust Cache
23+
uses: Swatinem/rust-cache@v2
1824

1925
- name: Restore cache
2026
id: cache-loc-report
@@ -49,7 +55,5 @@ jobs:
4955
if: always()
5056
run: |
5157
if [ -n "${{ secrets.SLACK_WEBHOOK }}" ]; then
52-
curl -X POST -H 'Content-type: application/json' \
53-
--data @tooling/slack_message.json \
54-
"${{ secrets.SLACK_WEBHOOK }}"
58+
sh .github/scripts/publish_loc.sh "${{ secrets.SLACK_WEBHOOK }}"
5559
fi

.github/workflows/pr_loc.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,15 @@ jobs:
3636
fetch-depth: 0
3737
ref: ${{ steps.find_merge_base.outputs.merge_base }}
3838

39-
- name: Setup Rust Environment
40-
uses: ./.github/actions/setup-rust
39+
- name: Rustup toolchain install
40+
uses: dtolnay/rust-toolchain@master
4141
with:
42+
toolchain: 1.87.0
4243
components: rustfmt, clippy
4344

45+
- name: Add Rust Cache
46+
uses: Swatinem/rust-cache@v2
47+
4448
- name: Run Lines of Code Counter for base
4549
run: cd tooling && make loc-detailed
4650
# This creates current_detailed_loc_report.json for the base branch
@@ -54,11 +58,15 @@ jobs:
5458
clean: "false" # Don't clean the workspace, so we can keep the previous report
5559
ref: ${{ github.event.pull_request.head.sha }}
5660

57-
- name: Setup Rust Environment
58-
uses: ./.github/actions/setup-rust
61+
- name: Rustup toolchain install
62+
uses: dtolnay/rust-toolchain@master
5963
with:
64+
toolchain: 1.87.0
6065
components: rustfmt, clippy
6166

67+
- name: Add Rust Cache
68+
uses: Swatinem/rust-cache@v2
69+
6270
- name: Run Lines of Code Counter for PR
6371
run: cd tooling && make loc-detailed
6472
# This creates current_detailed_loc_report.json

0 commit comments

Comments
 (0)