Skip to content

Commit c06ca35

Browse files
pythoninthegrassclaude
pythoninthegrass
and
claude
committed
fix(ci): resolve cargo fmt failures and bump GHA actions to Node 24
Apply cargo fmt to stats.rs and schema.rs. Bump actions/checkout v4->v6, actions/setup-node v4->v6, actions/upload-artifact v4->v7, and actions/cache v4->v5 to resolve Node.js 20 deprecation warnings. Fix cargo-check pre-commit hook to use workspace root. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a8f31cb commit c06ca35

5 files changed

Lines changed: 34 additions & 30 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
timeout-minutes: 30
3737

3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
4040

4141
- name: Setup Tauri build environment
4242
uses: ./.github/actions/setup-tauri-build
@@ -80,7 +80,7 @@ jobs:
8080
run: task ci:bundle TARGET=aarch64-apple-darwin
8181

8282
- name: Upload artifacts
83-
uses: actions/upload-artifact@v4
83+
uses: actions/upload-artifact@v7
8484
with:
8585
name: macos-arm64
8686
path: |
@@ -117,7 +117,7 @@ jobs:
117117
timeout-minutes: 30
118118

119119
steps:
120-
- uses: actions/checkout@v4
120+
- uses: actions/checkout@v6
121121

122122
- name: Setup Tauri build environment
123123
uses: ./.github/actions/setup-tauri-build
@@ -133,7 +133,7 @@ jobs:
133133
run: task ci:bundle TARGET=x86_64-unknown-linux-gnu BUNDLES=deb
134134

135135
- name: Upload artifacts
136-
uses: actions/upload-artifact@v4
136+
uses: actions/upload-artifact@v7
137137
with:
138138
name: linux-amd64
139139
path: target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb
@@ -156,13 +156,13 @@ jobs:
156156
timeout-minutes: 60
157157

158158
steps:
159-
- uses: actions/checkout@v4
159+
- uses: actions/checkout@v6
160160

161161
- name: Install Task
162162
uses: go-task/setup-task@v1
163163

164164
- name: Restore Taskfile fingerprint cache
165-
uses: actions/cache@v4
165+
uses: actions/cache@v5
166166
with:
167167
path: .task
168168
key: task-${{ runner.os }}-${{ hashFiles('taskfiles/ci.yml') }}
@@ -189,7 +189,7 @@ jobs:
189189
.
190190
191191
- name: Upload artifacts
192-
uses: actions/upload-artifact@v4
192+
uses: actions/upload-artifact@v7
193193
with:
194194
name: linux-arm64
195195
path: dist/linux-arm64/*.deb
@@ -227,7 +227,7 @@ jobs:
227227
echo "$gitPath\cmd" >> $env:GITHUB_PATH
228228
}
229229
230-
- uses: actions/checkout@v4
230+
- uses: actions/checkout@v6
231231

232232
- name: Setup Tauri build environment
233233
uses: ./.github/actions/setup-tauri-build
@@ -283,7 +283,7 @@ jobs:
283283
run: task ci:bundle TARGET=x86_64-pc-windows-msvc BUNDLES=nsis CONFIG=${{ env.SIGN_CONFIG_PATH }}
284284

285285
- name: Upload artifacts
286-
uses: actions/upload-artifact@v4
286+
uses: actions/upload-artifact@v7
287287
with:
288288
name: windows-x64
289289
path: target/x86_64-pc-windows-msvc/release/bundle/nsis/*.exe
@@ -312,7 +312,7 @@ jobs:
312312
runs-on: blacksmith-4vcpu-ubuntu-2404
313313

314314
steps:
315-
- uses: actions/checkout@v4
315+
- uses: actions/checkout@v6
316316
with:
317317
ref: main
318318
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
3939
echo "/opt/homebrew/bin:/opt/homebrew/sbin" >> $GITHUB_PATH
4040
41-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v6
4242

4343
- name: Setup Rust
4444
uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -59,7 +59,7 @@ jobs:
5959
timeout-minutes: 10
6060

6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v6
6363

6464
- name: Install Deno
6565
uses: denoland/setup-deno@v2
@@ -108,7 +108,7 @@ jobs:
108108
echo "$gitPath\cmd" >> $env:GITHUB_PATH
109109
}
110110
111-
- uses: actions/checkout@v4
111+
- uses: actions/checkout@v6
112112

113113
- name: Setup Tauri build environment
114114
uses: ./.github/actions/setup-tauri-build
@@ -140,10 +140,10 @@ jobs:
140140
timeout-minutes: 10
141141

142142
steps:
143-
- uses: actions/checkout@v4
143+
- uses: actions/checkout@v6
144144

145145
- name: Setup Node.js
146-
uses: actions/setup-node@v4
146+
uses: actions/setup-node@v6
147147
with:
148148
node-version: '20'
149149
cache: 'npm'
@@ -161,7 +161,7 @@ jobs:
161161
- name: Upload coverage report
162162
if: always()
163163
continue-on-error: true
164-
uses: actions/upload-artifact@v4
164+
uses: actions/upload-artifact@v7
165165
with:
166166
name: vitest-coverage
167167
path: app/frontend/coverage/
@@ -173,10 +173,10 @@ jobs:
173173
timeout-minutes: 20
174174

175175
steps:
176-
- uses: actions/checkout@v4
176+
- uses: actions/checkout@v6
177177

178178
- name: Setup Node.js
179-
uses: actions/setup-node@v4
179+
uses: actions/setup-node@v6
180180
with:
181181
node-version: '20'
182182

@@ -200,7 +200,7 @@ jobs:
200200
- name: Upload Playwright report
201201
if: always()
202202
continue-on-error: true
203-
uses: actions/upload-artifact@v4
203+
uses: actions/upload-artifact@v7
204204
with:
205205
name: playwright-report
206206
path: playwright-report/
@@ -209,7 +209,7 @@ jobs:
209209
- name: Upload test results
210210
if: always()
211211
continue-on-error: true
212-
uses: actions/upload-artifact@v4
212+
uses: actions/upload-artifact@v7
213213
with:
214214
name: playwright-results
215215
path: test-results/
@@ -225,7 +225,7 @@ jobs:
225225
CARGO_TERM_COLOR: always
226226

227227
steps:
228-
- uses: actions/checkout@v4
228+
- uses: actions/checkout@v6
229229

230230
- name: Setup Tauri build environment
231231
uses: ./.github/actions/setup-tauri-build
@@ -248,7 +248,7 @@ jobs:
248248
- name: Upload coverage report
249249
if: always()
250250
continue-on-error: true
251-
uses: actions/upload-artifact@v4
251+
uses: actions/upload-artifact@v7
252252
with:
253253
name: rust-coverage
254254
path: coverage/

‎.pre-commit-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ repos:
55
hooks:
66
- id: cargo-check
77
name: cargo check
8-
entry: cargo check --manifest-path src-tauri/Cargo.toml --quiet
8+
entry: cargo check --workspace --quiet
99
language: system
1010
types: [rust]
1111
pass_filenames: false

‎crates/mt-tauri/src/commands/stats.rs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,15 @@ fn draw_placeholder(
102102
// Center horizontally
103103
let line_x = x + margin + ((usable as f32 - line_width) / 2.0).max(0.0) as u32;
104104
let line_y = start_y + (i as f32 * line_height) as u32;
105-
draw_text_mut(canvas, color, line_x as i32, line_y as i32, px_scale, font, line);
105+
draw_text_mut(
106+
canvas,
107+
color,
108+
line_x as i32,
109+
line_y as i32,
110+
px_scale,
111+
font,
112+
line,
113+
);
106114
}
107115
}
108116

@@ -250,8 +258,7 @@ pub(crate) fn stats_generate_chart_grid(
250258
let y_offset = row as u32 * (cell_size + padding);
251259

252260
// Load artwork from cache
253-
let has_artwork = if let Some(artwork) =
254-
cache.get_or_load(album.track_id, &album.filepath)
261+
let has_artwork = if let Some(artwork) = cache.get_or_load(album.track_id, &album.filepath)
255262
&& let Ok(decoded) =
256263
base64::Engine::decode(&base64::engine::general_purpose::STANDARD, &artwork.data)
257264
&& let Ok(img) = image::load_from_memory(&decoded)
@@ -265,9 +272,7 @@ pub(crate) fn stats_generate_chart_grid(
265272
false
266273
};
267274

268-
if !has_artwork
269-
&& let Some(ref font) = font
270-
{
275+
if !has_artwork && let Some(ref font) = font {
271276
draw_placeholder(
272277
&mut canvas,
273278
x_offset,

‎crates/mt-tauri/src/db/schema.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@ pub(crate) fn run_migrations(conn: &Connection) -> DbResult<()> {
493493
info!("content_hash index created");
494494
}
495495

496-
497496
Ok(())
498497
}
499498

0 commit comments

Comments
 (0)