Skip to content

Commit 3fb770a

Browse files
author
Mohammod Al Amin Ashik
committed
removes duplicate build
1 parent 885db3d commit 3fb770a

3 files changed

Lines changed: 27 additions & 66 deletions

File tree

.github/actions/install-linux-deps/action.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Install Linux deps
2-
description: Install build and runtime deps for Tauri app on Ubuntu (with caching)
2+
description: Install build and runtime deps for Tauri app on Ubuntu
33
inputs:
44
e2e:
55
description: Include E2E desktop deps (webkit2gtk-driver, xvfb, gnome-keyring)
@@ -12,20 +12,19 @@ inputs:
1212
runs:
1313
using: composite
1414
steps:
15-
# Cache apt packages to avoid re-downloading on every run
16-
# Uses awalsh128/cache-apt-pkgs-action for efficient caching
17-
- name: Cache apt packages (base)
18-
uses: awalsh128/cache-apt-pkgs-action@latest
19-
with:
20-
packages: build-essential pkg-config libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
21-
version: 1.0
22-
23-
- name: Cache apt packages (E2E)
24-
if: ${{ inputs.e2e == 'true' }}
25-
uses: awalsh128/cache-apt-pkgs-action@latest
26-
with:
27-
packages: webkit2gtk-driver xvfb gnome-keyring gsettings-desktop-schemas dbus-x11 at-spi2-core
28-
version: 1.1
15+
- name: Install Linux deps
16+
shell: bash
17+
run: |
18+
BASE_DEPS="build-essential pkg-config libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev"
19+
E2E_DEPS="webkit2gtk-driver xvfb gnome-keyring gsettings-desktop-schemas dbus-x11 at-spi2-core libglib2.0-bin"
20+
sudo apt-get update
21+
if [ "${{ inputs.e2e }}" = "true" ]; then
22+
sudo apt-get install -y $BASE_DEPS $E2E_DEPS
23+
# Compile gsettings schemas to make them available
24+
sudo glib-compile-schemas /usr/share/glib-2.0/schemas/ || true
25+
else
26+
sudo apt-get install -y $BASE_DEPS
27+
fi
2928
3029
- name: Verify glib installation
3130
if: ${{ inputs.verify_glib == 'true' }}

.github/workflows/ci.yml

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -188,44 +188,25 @@ jobs:
188188
retention-days: 7
189189

190190
# ─────────────────────────────────────────────────────────────
191-
# Build Verification (ensures app compiles on all platforms)
192-
# Runs after checks pass; uses cached Rust build artifacts
191+
# Build Verification (macOS only - Linux/Windows covered by e2e-desktop)
193192
# ─────────────────────────────────────────────────────────────
194193
build:
195194
needs: [rust-check, ts-check]
196-
strategy:
197-
fail-fast: false
198-
matrix:
199-
include:
200-
- os: ubuntu-latest
201-
target: x86_64-unknown-linux-gnu
202-
- os: windows-latest
203-
target: x86_64-pc-windows-msvc
204-
- os: macos-latest
205-
target: aarch64-apple-darwin
206-
207-
runs-on: ${{ matrix.os }}
195+
runs-on: macos-latest
196+
env:
197+
MACOSX_DEPLOYMENT_TARGET: '10.13'
208198
steps:
209199
- uses: actions/checkout@v4
210200

211-
- name: Install Linux deps
212-
if: matrix.os == 'ubuntu-latest'
213-
uses: ./.github/actions/install-linux-deps
214-
215201
- uses: dtolnay/rust-toolchain@stable
216202
with:
217-
targets: ${{ matrix.target }}
218-
env:
219-
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
203+
targets: aarch64-apple-darwin
220204

221-
# Use shared cache key so builds benefit from rust-test artifacts
222205
- uses: Swatinem/rust-cache@v2
223206
with:
224-
key: ${{ matrix.target }}
225-
shared-key: rust-${{ matrix.target }}
207+
key: aarch64-apple-darwin
208+
shared-key: rust-aarch64-apple-darwin
226209
cache-on-failure: true
227-
env:
228-
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
229210

230211
- uses: pnpm/action-setup@v4
231212
- uses: actions/setup-node@v4
@@ -246,7 +227,7 @@ jobs:
246227
restore-keys: |
247228
pnpm-store-${{ runner.os }}-
248229
249-
# Cache Tauri CLI binary (avoid recompiling on every run)
230+
# Cache Tauri CLI binary
250231
- name: Cache Tauri CLI
251232
uses: actions/cache@v4
252233
with:
@@ -260,7 +241,6 @@ jobs:
260241
- run: pnpm install --frozen-lockfile
261242
- run: pnpm build
262243
env:
263-
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
264244
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
265245

266246
# ─────────────────────────────────────────────────────────────
@@ -425,30 +405,12 @@ jobs:
425405
fail-on-error: false
426406

427407
# ─────────────────────────────────────────────────────────────
428-
# E2E Desktop trigger check: main, [e2e] in commit, or /e2e-desktop comment on PR
429-
# ─────────────────────────────────────────────────────────────
430-
e2e-trigger-check:
431-
runs-on: ubuntu-latest
432-
outputs:
433-
run_e2e: ${{ steps.check.outputs.should_run }}
434-
steps:
435-
- uses: actions/checkout@v4
436-
- name: Check if e2e-desktop should run
437-
id: check
438-
uses: ./.github/actions/check-comment-trigger
439-
with:
440-
trigger: '/e2e-desktop'
441-
check_main: 'true'
442-
check_commit: 'true'
443-
444-
# ─────────────────────────────────────────────────────────────
445-
# E2E Tests (Desktop app with WebDriver - Linux/Windows only)
446-
# Runs when: main branch, [e2e] in commit, or /e2e-desktop comment on PR
447-
# Runs in parallel with build for faster CI (cache helps on subsequent runs)
408+
# E2E Tests (Desktop app with WebDriver - Linux/Windows)
409+
# Runs on all commits; skip with [skip e2e] in commit message
448410
# ─────────────────────────────────────────────────────────────
449411
e2e-desktop:
450-
needs: [e2e-trigger-check]
451-
if: needs.e2e-trigger-check.outputs.run_e2e == 'true'
412+
needs: [rust-check, ts-check]
413+
if: "!contains(github.event.head_commit.message, '[skip e2e]')"
452414
uses: ./.github/workflows/e2e-desktop.yml
453415
with:
454416
ref: ${{ github.event.pull_request.head.sha || github.sha }}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thank you for your interest in contributing!
44

55
## License
66

7-
This project is licensed under the [Elastic License 2.0 (ELv2)](LICENSE). By contributing, you agree that your contributions will be licensed under the same license.
7+
This project is licensed under the [GNU General Public License v3.0 (GPL-3.0)](LICENSE). By contributing, you agree that your contributions will be licensed under the same license.
88

99
## Developer Certificate of Origin (DCO)
1010

0 commit comments

Comments
 (0)