Skip to content

Commit ae3c920

Browse files
authored
Merge pull request #317 from terraphim/claude/fix-github-actions-01BaFSR3QvaViw4AhVxem7Zk
Review GitHub Actions failure and create fix
2 parents fe92d6c + 70e184e commit ae3c920

5 files changed

Lines changed: 38 additions & 51 deletions

File tree

.github/workflows/frontend-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ jobs:
3232
uses: actions/setup-node@v5
3333
with:
3434
node-version: ${{ inputs.node-version }}
35-
cache: 'npm'
36-
cache-dependency-path: desktop/package-lock.json
35+
cache: 'yarn'
36+
cache-dependency-path: desktop/yarn.lock
3737

38-
- name: Cache node modules and npm cache
38+
- name: Cache node modules and yarn cache
3939
uses: actions/cache@v4
4040
with:
4141
path: |
4242
desktop/node_modules
43-
~/.npm
44-
key: ${{ inputs.cache-key }}-npm-${{ inputs.node-version }}-${{ hashFiles('desktop/package-lock.json') }}
43+
~/.yarn
44+
key: ${{ inputs.cache-key }}-yarn-${{ inputs.node-version }}-${{ hashFiles('desktop/yarn.lock') }}
4545
restore-keys: |
46-
${{ inputs.cache-key }}-npm-${{ inputs.node-version }}-
47-
${{ inputs.cache-key }}-npm-
46+
${{ inputs.cache-key }}-yarn-${{ inputs.node-version }}-
47+
${{ inputs.cache-key }}-yarn-
4848
4949
- name: Set environment variables for CI
5050
env:

.github/workflows/release-comprehensive.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
matrix:
2020
include:
2121
# Linux builds
22-
- os: ubuntu-20.04
22+
- os: ubuntu-22.04
2323
target: x86_64-unknown-linux-gnu
2424
use_cross: false
25-
- os: ubuntu-20.04
25+
- os: ubuntu-22.04
2626
target: x86_64-unknown-linux-musl
2727
use_cross: true
28-
- os: ubuntu-20.04
28+
- os: ubuntu-22.04
2929
target: aarch64-unknown-linux-musl
3030
use_cross: true
31-
- os: ubuntu-20.04
31+
- os: ubuntu-22.04
3232
target: armv7-unknown-linux-musleabihf
3333
use_cross: true
3434
# macOS builds
@@ -96,7 +96,7 @@ jobs:
9696

9797
build-debian-packages:
9898
name: Build Debian packages
99-
runs-on: ubuntu-20.04
99+
runs-on: ubuntu-22.04
100100
steps:
101101
- name: Checkout repository
102102
uses: actions/checkout@v5
@@ -137,12 +137,16 @@ jobs:
137137
include:
138138
- platform: macos-latest
139139
webkit-package: ""
140-
- platform: ubuntu-20.04
141-
webkit-package: "libwebkit2gtk-4.0-dev"
140+
javascriptcore-package: ""
142141
- platform: ubuntu-22.04
143-
webkit-package: "libwebkit2gtk-4.0-dev"
142+
webkit-package: "libwebkit2gtk-4.1-dev"
143+
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
144+
- platform: ubuntu-24.04
145+
webkit-package: "libwebkit2gtk-4.1-dev"
146+
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
144147
- platform: windows-latest
145148
webkit-package: ""
149+
javascriptcore-package: ""
146150
runs-on: ${{ matrix.platform }}
147151
steps:
148152
- name: Checkout repository
@@ -168,7 +172,7 @@ jobs:
168172
run: |
169173
sudo apt-get update
170174
sudo apt-get install -y libgtk-3-dev ${{ matrix.webkit-package }} \
171-
libjavascriptcoregtk-4.0-dev libsoup2.4-dev libayatana-appindicator3-dev librsvg2-dev pkg-config
175+
${{ matrix.javascriptcore-package }} libsoup2.4-dev libayatana-appindicator3-dev librsvg2-dev pkg-config
172176
173177
- name: Install frontend dependencies
174178
working-directory: ./desktop

.github/workflows/tauri-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install Rust toolchain
4242
uses: dtolnay/rust-toolchain@stable
4343
with:
44-
toolchain: 1.85.0
44+
toolchain: 1.87.0
4545

4646
- name: Cache Rust dependencies
4747
uses: actions/cache@v4

.github/workflows/test-on-pr-desktop.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ jobs:
1313
include:
1414
- platform: macos-latest
1515
webkit-package: ""
16-
- platform: ubuntu-18.04
17-
webkit-package: "libwebkit2gtk-4.0-dev"
18-
- platform: ubuntu-20.04
19-
webkit-package: "libwebkit2gtk-4.0-dev"
16+
javascriptcore-package: ""
2017
- platform: ubuntu-22.04
21-
webkit-package: "libwebkit2gtk-4.0-dev"
18+
webkit-package: "libwebkit2gtk-4.1-dev"
19+
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
2220
- platform: ubuntu-24.04
23-
webkit-package: "libwebkit2gtk-4.0-dev"
21+
webkit-package: "libwebkit2gtk-4.1-dev"
22+
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
2423
- platform: windows-latest
2524
webkit-package: ""
25+
javascriptcore-package: ""
2626

2727
runs-on: ${{ matrix.platform }}
2828

@@ -32,25 +32,23 @@ jobs:
3232
- name: Setup Node.js
3333
uses: actions/setup-node@v5
3434
with:
35-
node-version: latest
35+
node-version: '20'
3636

3737
- name: Install Rust stable
38-
uses: actions-rs/toolchain@v1
38+
uses: dtolnay/rust-toolchain@stable
3939
with:
4040
toolchain: stable
41-
profile: minimal
42-
override: true
4341

4442
- name: Install dependencies (Ubuntu only)
4543
if: startsWith(matrix.platform, 'ubuntu-')
4644
run: |
4745
sudo apt-get update
48-
sudo apt-get install -y libgtk-3-dev ${{ matrix.webkit-package }} libjavascriptcoregtk-4.0-dev libsoup2.4-dev libayatana-appindicator3-dev librsvg2-dev pkg-config
46+
sudo apt-get install -y libgtk-3-dev ${{ matrix.webkit-package }} ${{ matrix.javascriptcore-package }} libsoup2.4-dev libayatana-appindicator3-dev librsvg2-dev pkg-config
4947
5048
- name: Install and Build Application
5149
run: yarn install && yarn build
5250
working-directory: ${{ env.WORKING_DIRECTORY }}
5351

54-
- uses: tauri-apps/tauri-action@v0
52+
- uses: tauri-apps/tauri-action@v0.5
5553
env:
5654
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vm-execution-tests.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ jobs:
4242
uses: actions/checkout@v4
4343

4444
- name: Install Rust toolchain
45-
uses: actions-rs/toolchain@v1
45+
uses: dtolnay/rust-toolchain@stable
4646
with:
4747
toolchain: stable
48-
profile: minimal
49-
override: true
5048
components: rustfmt, clippy
5149

5250
- name: Cache cargo dependencies
@@ -112,11 +110,9 @@ jobs:
112110
uses: actions/checkout@v4
113111

114112
- name: Install Rust toolchain
115-
uses: actions-rs/toolchain@v1
113+
uses: dtolnay/rust-toolchain@stable
116114
with:
117115
toolchain: stable
118-
profile: minimal
119-
override: true
120116

121117
- name: Install system dependencies
122118
run: |
@@ -212,11 +208,9 @@ jobs:
212208
uses: actions/checkout@v4
213209

214210
- name: Install Rust toolchain
215-
uses: actions-rs/toolchain@v1
211+
uses: dtolnay/rust-toolchain@stable
216212
with:
217213
toolchain: stable
218-
profile: minimal
219-
override: true
220214

221215
- name: Cache cargo dependencies
222216
uses: actions/cache@v4
@@ -289,11 +283,9 @@ jobs:
289283
uses: actions/checkout@v4
290284

291285
- name: Install Rust toolchain
292-
uses: actions-rs/toolchain@v1
286+
uses: dtolnay/rust-toolchain@stable
293287
with:
294288
toolchain: stable
295-
profile: minimal
296-
override: true
297289

298290
- name: Cache cargo dependencies
299291
uses: actions/cache@v4
@@ -381,11 +373,9 @@ jobs:
381373
uses: actions/checkout@v4
382374

383375
- name: Install Rust toolchain
384-
uses: actions-rs/toolchain@v1
376+
uses: dtolnay/rust-toolchain@stable
385377
with:
386378
toolchain: stable
387-
profile: minimal
388-
override: true
389379

390380
- name: Cache cargo dependencies
391381
uses: actions/cache@v4
@@ -473,11 +463,9 @@ jobs:
473463
uses: actions/checkout@v4
474464

475465
- name: Install Rust toolchain
476-
uses: actions-rs/toolchain@v1
466+
uses: dtolnay/rust-toolchain@stable
477467
with:
478468
toolchain: stable
479-
profile: minimal
480-
override: true
481469

482470
- name: Cache cargo dependencies
483471
uses: actions/cache@v4
@@ -612,11 +600,8 @@ jobs:
612600
uses: actions/checkout@v4
613601

614602
- name: Install Rust nightly
615-
uses: actions-rs/toolchain@v1
603+
uses: dtolnay/rust-toolchain@nightly
616604
with:
617-
toolchain: nightly
618-
profile: minimal
619-
override: true
620605
components: rustfmt, clippy, llvm-tools-preview
621606

622607
- name: Install grcov

0 commit comments

Comments
 (0)