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
7 changes: 5 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ jobs:
components: rust-src
targets: ${{ matrix.platform.target }}

- name: install webkit2gtk and xvfb (ubuntu only)
- name: install WebKitGTK and xvfb (ubuntu only)
if: contains(matrix.platform.target, 'gnu')
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y --no-install-recommends \
webkit2gtk-4.1 libayatana-appindicator3-dev \
libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev \
xvfb \
at-spi2-core

Expand Down Expand Up @@ -86,6 +87,8 @@ jobs:
cargo +nightly build --release -Z build-std=std,panic_abort -Z build-std-features= --target ${{ matrix.platform.target }} --manifest-path bench/tests/helloworld/src-tauri/Cargo.toml

- name: run benchmarks
env:
WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS: ${{ contains(matrix.platform.target, 'gnu') && '1' || '' }}
run: ${{ matrix.platform.runner }}cargo run --manifest-path ./bench/Cargo.toml --bin run_benchmark

- name: clone benchmarks_results
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ jobs:

- name: install Linux dependencies
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
sudo apt-get install -y libgtk-4-dev

- uses: Swatinem/rust-cache@v2

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/covector-version-or-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ jobs:
- name: install Linux dependencies
if: matrix.platform == 'ubuntu-latest'
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2 librsvg2-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev libfuse2 librsvg2-dev

- uses: Swatinem/rust-cache@v2

Expand Down Expand Up @@ -87,8 +88,9 @@ jobs:

- name: install Linux dependencies
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev

- name: covector version or publish (publish when no change files present)
uses: jbolda/covector/packages/action@covector-v0
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ jobs:

- name: install Linux dependencies
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
sudo apt-get install -y libgtk-4-dev

- name: install cross
run: cargo install cross --git https://github.com/cross-rs/cross
Expand Down Expand Up @@ -107,8 +108,9 @@ jobs:

- name: install dependencies
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev

- name: Test
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
paths:
- '.github/workflows/lint-rust.yml'
- 'crates/**'
- 'ports/**'
- 'Cargo.toml'
- 'Cargo.lock'

Expand Down Expand Up @@ -39,7 +40,7 @@ jobs:
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev

- uses: Swatinem/rust-cache@v2

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/publish-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
target: aarch64-unknown-linux-gnu
build: pnpm build --target=aarch64-unknown-linux-gnu --cross-compile
setup: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu -y
- host: ubuntu-latest
Expand All @@ -69,6 +70,7 @@ jobs:
target: riscv64gc-unknown-linux-gnu
build: pnpm build --target=riscv64gc-unknown-linux-gnu --cross-compile
setup: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu -y
name: stable - ${{ matrix.settings.target }} - node@20
Expand Down Expand Up @@ -208,8 +210,9 @@ jobs:
- name: install system dependencies (gnu)
if: ${{ endsWith(matrix.target, 'gnu') }}
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev

- name: Setup and run tests (gnu)
if: ${{ endsWith(matrix.target, 'gnu') }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish-cli-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ jobs:
- name: install Linux dependencies
if: ${{ !matrix.config.cross && startsWith(matrix.config.os, 'ubuntu') }}
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
sudo apt-get install -y libgtk-4-dev

- name: Install cross
if: ${{ matrix.config.cross }}
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/test-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: install Rust 1.90
uses: dtolnay/rust-toolchain@1.90
- name: install Rust 1.92
uses: dtolnay/rust-toolchain@1.92

- name: install Linux dependencies
if: matrix.platform == 'ubuntu-latest'
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev

- run: npm i -g --force corepack
- name: setup node
Expand All @@ -66,7 +67,12 @@ jobs:
- name: Restore Android Symlinks
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'macos-latest'
run: |
directory="${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin"
case "$RUNNER_OS" in
Linux) prebuilt="linux-x86_64" ;;
macOS) prebuilt="darwin-x86_64" ;;
esac

directory="${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/${prebuilt}/bin"
find "$directory" -type l | while read link; do
current_target=$(readlink "$link")
new_target="$directory/$(basename "$current_target")"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ jobs:
- name: install Linux dependencies
if: matrix.platform == 'ubuntu-latest'
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev

- uses: Swatinem/rust-cache@v2

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test-cli-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'crates/tauri-utils/**'
- 'crates/tauri-bundler/**'
- 'crates/tauri-cli/**'
- 'ports/**'
- 'Cargo.toml'
- 'Cargo.lock'

Expand Down Expand Up @@ -46,7 +47,7 @@ jobs:
- uses: actions/checkout@v4

- name: 'Setup Rust'
uses: dtolnay/rust-toolchain@1.90
uses: dtolnay/rust-toolchain@1.92
with:
targets: ${{ matrix.platform.target }}

Expand All @@ -55,7 +56,7 @@ jobs:
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev librsvg2-dev

- uses: Swatinem/rust-cache@v2

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
paths:
- '.github/workflows/test-core.yml'
- 'crates/**'
- 'ports/**'
- 'Cargo.toml'
- 'Cargo.lock'
- '!crates/tauri/scripts/**'
Expand Down Expand Up @@ -39,35 +40,35 @@ jobs:
- {
target: x86_64-pc-windows-msvc,
os: windows-latest,
toolchain: '1.90',
toolchain: '1.92',
cargo: cargo,
command: 'test'
}
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-latest,
toolchain: '1.90',
toolchain: '1.92',
cargo: cargo,
command: 'test'
}
- {
target: aarch64-apple-darwin,
os: macos-14,
toolchain: '1.90',
toolchain: '1.92',
cargo: cargo,
command: 'test'
}
- {
target: aarch64-apple-ios,
os: macos-latest,
toolchain: '1.90',
toolchain: '1.92',
cargo: cargo,
command: 'build'
}
- {
target: aarch64-linux-android,
os: ubuntu-latest,
toolchain: '1.90',
toolchain: '1.92',
cargo: cross,
command: 'build'
}
Expand All @@ -89,7 +90,7 @@ jobs:
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libxdo-dev libayatana-appindicator3-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev libxdo-dev

- uses: Swatinem/rust-cache@v2
with:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/udeps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
- 'crates/tauri-runtime/**'
wry:
- 'crates/tauri-runtime-wry/**'
- 'ports/**'
utils:
- 'crates/tauri-utils/**'
bundler:
Expand Down Expand Up @@ -132,8 +133,9 @@ jobs:

- name: install dependencies
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
sudo apt-get install -y libgtk-4-dev

- uses: Swatinem/rust-cache@v2

Expand All @@ -147,8 +149,9 @@ jobs:

- name: Install required packages
run: |
sudo find /etc/apt/sources.list.d -maxdepth 1 -type f -exec grep -l "packages.microsoft.com" {} \; | xargs -r sudo rm -f
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev libdbus-1-dev libxdo-dev

- name: Run udeps
run: cargo udeps --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features
Loading
Loading