Skip to content

Commit

Permalink
Break CI out into it's own step, update android targets
Browse files Browse the repository at this point in the history
  • Loading branch information
erskingardner committed Jan 6, 2025
1 parent dea2d61 commit 8534da5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 12 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
args: "--target x86_64-apple-darwin"
- platform: "ubuntu-22.04"
args: ""
# Android builds per architecture
# Android builds with correct target names
- platform: "ubuntu-22.04"
android: true
android_target: "aarch64-linux-android"
android_target: "aarch64"
abi: "arm64-v8a"
- platform: "ubuntu-22.04"
android: true
android_target: "armv7-linux-androideabi"
android_target: "armv7"
abi: "armeabi-v7a"
- platform: "ubuntu-22.04"
android: true
android_target: "x86_64-linux-android"
android_target: "x86_64"
abi: "x86_64"

runs-on: ${{ matrix.platform }}
Expand Down Expand Up @@ -79,14 +79,6 @@ jobs:
- name: Install frontend dependencies
run: bun install

- name: Run tests
if: ${{ !matrix.android }}
run: cd src-tauri && cargo test --all-features

- name: Run clippy
if: ${{ !matrix.android }}
run: cd src-tauri && cargo clippy -- -D warnings

- name: Import GPG key
if: matrix.platform == 'ubuntu-22.04' && !matrix.android
uses: crazy-max/ghaction-import-gpg@v6
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: "CI"

on:
workflow_call: {} # Allow this workflow to be called by other workflows
pull_request:
push:

jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup bun
uses: oven-sh/setup-bun@v1
with:
bun-version: 1.1.39

- name: Install Rust stable
uses: dtolnay/rust-toolchain@stable

- name: Install frontend dependencies
run: bun install

- name: Run tests
run: cd src-tauri && cargo test --all-features

- name: Run clippy
run: cd src-tauri && cargo clippy -- -D warnings

0 comments on commit 8534da5

Please sign in to comment.