Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ jobs:
uses: actions/setup-node@v5
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'
cache-dependency-path: desktop/package-lock.json
cache: 'yarn'
cache-dependency-path: desktop/yarn.lock

- name: Cache node modules and npm cache
- name: Cache node modules and yarn cache
uses: actions/cache@v4
with:
path: |
desktop/node_modules
~/.npm
key: ${{ inputs.cache-key }}-npm-${{ inputs.node-version }}-${{ hashFiles('desktop/package-lock.json') }}
~/.yarn
key: ${{ inputs.cache-key }}-yarn-${{ inputs.node-version }}-${{ hashFiles('desktop/yarn.lock') }}
restore-keys: |
${{ inputs.cache-key }}-npm-${{ inputs.node-version }}-
${{ inputs.cache-key }}-npm-
${{ inputs.cache-key }}-yarn-${{ inputs.node-version }}-
${{ inputs.cache-key }}-yarn-

- name: Set environment variables for CI
env:
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/release-comprehensive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
matrix:
include:
# Linux builds
- os: ubuntu-20.04
- os: ubuntu-22.04
target: x86_64-unknown-linux-gnu
use_cross: false
- os: ubuntu-20.04
- os: ubuntu-22.04
target: x86_64-unknown-linux-musl
use_cross: true
- os: ubuntu-20.04
- os: ubuntu-22.04
target: aarch64-unknown-linux-musl
use_cross: true
- os: ubuntu-20.04
- os: ubuntu-22.04
target: armv7-unknown-linux-musleabihf
use_cross: true
# macOS builds
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

build-debian-packages:
name: Build Debian packages
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v5
Expand Down Expand Up @@ -137,12 +137,16 @@ jobs:
include:
- platform: macos-latest
webkit-package: ""
- platform: ubuntu-20.04
webkit-package: "libwebkit2gtk-4.0-dev"
javascriptcore-package: ""
- platform: ubuntu-22.04
webkit-package: "libwebkit2gtk-4.0-dev"
webkit-package: "libwebkit2gtk-4.1-dev"
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
Comment on lines 141 to +143

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Avoid libwebkit 4.1 packages on ubuntu-22.04 runner

The Ubuntu leg of the tauri desktop release matrix now asks for libwebkit2gtk-4.1-dev and libjavascriptcoregtk-4.1-dev, but Ubuntu 22.04 only provides the 4.0 variants. On the ubuntu-22.04 runner this apt step will fail with “Unable to locate package” before any build logic runs, breaking desktop artifact publishing for that platform. Consider keeping 4.0 on 22.04 (or switching the runner to 24.04) so the workflow can install dependencies.

Useful? React with 👍 / 👎.

- platform: ubuntu-24.04
webkit-package: "libwebkit2gtk-4.1-dev"
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
- platform: windows-latest
webkit-package: ""
javascriptcore-package: ""
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout repository
Expand All @@ -168,7 +172,7 @@ jobs:
run: |
sudo apt-get update
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
${{ matrix.javascriptcore-package }} libsoup2.4-dev libayatana-appindicator3-dev librsvg2-dev pkg-config

- name: Install frontend dependencies
working-directory: ./desktop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tauri-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.85.0
toolchain: 1.87.0

- name: Cache Rust dependencies
uses: actions/cache@v4
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/test-on-pr-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
include:
- platform: macos-latest
webkit-package: ""
- platform: ubuntu-18.04
webkit-package: "libwebkit2gtk-4.0-dev"
- platform: ubuntu-20.04
webkit-package: "libwebkit2gtk-4.0-dev"
javascriptcore-package: ""
- platform: ubuntu-22.04
webkit-package: "libwebkit2gtk-4.0-dev"
webkit-package: "libwebkit2gtk-4.1-dev"
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
Comment on lines 17 to +19

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update Ubuntu 22.04 Tauri test deps to available packages

The PR desktop test matrix now installs libwebkit2gtk-4.1-dev and libjavascriptcoregtk-4.1-dev on ubuntu-22.04, but those package names are not available in 22.04’s default repositories (only the 4.0 variants exist). The “Install dependencies (Ubuntu only)” step will therefore fail on the 22.04 runner before the Tauri build runs, causing the PR workflow to fail for Linux. Use the 4.0 packages on 22.04 or run the job on 24.04 where 4.1 exists.

Useful? React with 👍 / 👎.

- platform: ubuntu-24.04
webkit-package: "libwebkit2gtk-4.0-dev"
webkit-package: "libwebkit2gtk-4.1-dev"
javascriptcore-package: "libjavascriptcoregtk-4.1-dev"
- platform: windows-latest
webkit-package: ""
javascriptcore-package: ""

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

Expand All @@ -32,25 +32,23 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v5
with:
node-version: latest
node-version: '20'

- name: Install Rust stable
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true

- name: Install dependencies (Ubuntu only)
if: startsWith(matrix.platform, 'ubuntu-')
run: |
sudo apt-get update
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
sudo apt-get install -y libgtk-3-dev ${{ matrix.webkit-package }} ${{ matrix.javascriptcore-package }} libsoup2.4-dev libayatana-appindicator3-dev librsvg2-dev pkg-config

- name: Install and Build Application
run: yarn install && yarn build
working-directory: ${{ env.WORKING_DIRECTORY }}

- uses: tauri-apps/tauri-action@v0
- uses: tauri-apps/tauri-action@v0.5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29 changes: 7 additions & 22 deletions .github/workflows/vm-execution-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true
components: rustfmt, clippy

- name: Cache cargo dependencies
Expand Down Expand Up @@ -112,11 +110,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true

- name: Install system dependencies
run: |
Expand Down Expand Up @@ -212,11 +208,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true

- name: Cache cargo dependencies
uses: actions/cache@v4
Expand Down Expand Up @@ -289,11 +283,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true

- name: Cache cargo dependencies
uses: actions/cache@v4
Expand Down Expand Up @@ -381,11 +373,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true

- name: Cache cargo dependencies
uses: actions/cache@v4
Expand Down Expand Up @@ -473,11 +463,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
override: true

- name: Cache cargo dependencies
uses: actions/cache@v4
Expand Down Expand Up @@ -612,11 +600,8 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust nightly
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly
profile: minimal
override: true
components: rustfmt, clippy, llvm-tools-preview

- name: Install grcov
Expand Down
Loading