Skip to content

Commit 14d09f2

Browse files
committed
fix: Remove act submodules and update workflows for Cargo.lock v4
1 parent 9f3f995 commit 14d09f2

File tree

7 files changed

+24
-18
lines changed

7 files changed

+24
-18
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ jobs:
3333
rust: [1.86.0, stable, beta]
3434
include:
3535
# Add MSRV (Minimum Supported Rust Version) check on Ubuntu
36+
# Cargo.lock version 4 requires Rust 1.77.0 or later
3637
- os: ubuntu-latest
37-
rust: 1.75.0 # Updated MSRV to support Cargo.lock version 4
38+
rust: 1.77.0 # MSRV that supports Cargo.lock version 4
3839

3940
steps:
4041
# Step 1: Check out the source code from the repository
@@ -92,9 +93,9 @@ jobs:
9293
- name: Checkout source code
9394
uses: actions/checkout@v4
9495

95-
# Step 2: Install stable Rust with required components
96+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
9697
- name: Install Rust toolchain
97-
uses: dtolnay/rust-toolchain@stable
98+
uses: dtolnay/rust-toolchain@1.86.0
9899
with:
99100
components: rustfmt, clippy
100101

@@ -135,19 +136,27 @@ jobs:
135136
- name: Checkout source code
136137
uses: actions/checkout@v4
137138

138-
# Step 2: Install cargo-audit for security scanning
139+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
140+
- name: Install Rust toolchain
141+
uses: dtolnay/[email protected]
142+
143+
# Step 3: Setup Rust caching
144+
- name: Setup Rust cache
145+
uses: Swatinem/rust-cache@v2
146+
147+
# Step 4: Install cargo-audit for security scanning
139148
- name: Install cargo-audit
140149
run: cargo install cargo-audit --locked
141150

142-
# Step 3: Run security audit on dependencies
151+
# Step 5: Run security audit on dependencies
143152
# This checks for known security vulnerabilities in our dependencies
144153
# We ignore RUSTSEC-2023-0071 (RSA timing sidechannel) as it's a transitive
145154
# dependency through sqlx-mysql with no fix available, and poses minimal
146155
# risk for educational examples that don't handle sensitive RSA operations
147156
- name: Run security audit
148157
run: cargo audit --ignore RUSTSEC-2023-0071
149158

150-
# Step 4: Check for vulnerabilities in our Cargo.lock file
159+
# Step 6: Check for vulnerabilities in our Cargo.lock file
151160
- name: Check advisories
152161
run: cargo audit --json | jq '.vulnerabilities'
153162

@@ -161,9 +170,9 @@ jobs:
161170
- name: Checkout source code
162171
uses: actions/checkout@v4
163172

164-
# Step 2: Install stable Rust toolchain
173+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
165174
- name: Install Rust toolchain
166-
uses: dtolnay/rust-toolchain@stable
175+
uses: dtolnay/rust-toolchain@1.86.0
167176

168177
# Step 3: Setup caching
169178
- name: Setup Rust cache

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ jobs:
4848
- name: Checkout source code
4949
uses: actions/checkout@v4
5050

51-
# Step 2: Install Rust toolchain
51+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
5252
- name: Install Rust toolchain
53-
uses: dtolnay/rust-toolchain@stable
53+
uses: dtolnay/rust-toolchain@1.86.0
5454

5555
# Step 3: Setup Rust caching
5656
- name: Setup Rust cache
@@ -588,9 +588,9 @@ jobs:
588588
- name: Checkout source code
589589
uses: actions/checkout@v4
590590

591-
# Step 2: Install Rust toolchain
591+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
592592
- name: Install Rust toolchain
593-
uses: dtolnay/rust-toolchain@stable
593+
uses: dtolnay/rust-toolchain@1.86.0
594594

595595
# Step 3: Setup Rust caching
596596
- name: Setup Rust cache

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
- name: Checkout source code
124124
uses: actions/checkout@v4
125125

126-
# Step 2: Install Rust toolchain with the target architecture
126+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
127127
- name: Install Rust toolchain
128128
uses: dtolnay/[email protected]
129129
with:

.github/workflows/security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
- name: Checkout source code
4141
uses: actions/checkout@v4
4242

43-
# Step 2: Install Rust toolchain
43+
# Step 2: Install Rust toolchain with Cargo.lock v4 support
4444
- name: Install Rust toolchain
45-
uses: dtolnay/rust-toolchain@stable
45+
uses: dtolnay/rust-toolchain@1.86.0
4646

4747
# Step 3: Setup Rust caching
4848
- name: Setup Rust cache

~/.cache/act/Swatinem-rust-cache@v2

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

0 commit comments

Comments
 (0)