Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5b9e8fb
Draft: Justfile changes
timokoesters Sep 23, 2025
a2642fb
Draft: CI changes
timokoesters Sep 23, 2025
406fb94
Install reuse for license checks
timokoesters Sep 23, 2025
fb3c319
Combine check and test
timokoesters Sep 23, 2025
5e585ad
Try to install flutter fvm
timokoesters Sep 23, 2025
1ac2065
Use fvm for dart format
timokoesters Sep 23, 2025
45d2ad4
Install frb
timokoesters Sep 23, 2025
2623ea8
For some reason this fixes flutter analyze
timokoesters Sep 23, 2025
05dee0c
Install podman
timokoesters Sep 23, 2025
e2ca007
More debugging to see what is slow
timokoesters Sep 24, 2025
158c8f3
Try caching
timokoesters Sep 24, 2025
afe6086
Fail CI
timokoesters Sep 24, 2025
f143a43
Fix exit code
timokoesters Sep 24, 2025
bb03ee0
Try to fix failing test
timokoesters Sep 24, 2025
de43a52
Improve flaky test
timokoesters Sep 24, 2025
3e9f341
Fix env vars and allow building debug locally
timokoesters Sep 24, 2025
89467d0
Split up ci
timokoesters Sep 24, 2025
3403e3f
fmt
timokoesters Sep 24, 2025
aaf67c8
Conditionally install frb
timokoesters Sep 24, 2025
a2d8eaa
install fvm for frb
timokoesters Sep 24, 2025
aeee29c
Try getting rid of cargo build
timokoesters Sep 24, 2025
fca0eba
Try to fix binstall path
timokoesters Sep 24, 2025
261e3bf
Try to fix builds
timokoesters Sep 24, 2025
2fed1c1
Try to fix windows
timokoesters Sep 24, 2025
b087444
fix windows
timokoesters Sep 30, 2025
2058913
Merge remote-tracking branch 'origin/main' into timo/justfile
timokoesters Sep 30, 2025
61db35b
fix windows
timokoesters Sep 30, 2025
61dd700
Improve CI
timokoesters Sep 30, 2025
40ac0a2
Reorder tasks
timokoesters Sep 30, 2025
8a02adb
Rename android apk
timokoesters Sep 30, 2025
20a4bd6
debugging
timokoesters Sep 30, 2025
84e4ece
Remove tests
timokoesters Oct 1, 2025
6ba9554
Fix reset-dev
timokoesters Oct 1, 2025
1eec13e
Figure out sqlx
timokoesters Oct 1, 2025
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
21 changes: 9 additions & 12 deletions .github/workflows/android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
SQLX_OFFLINE: true

jobs:
android-build:
Expand All @@ -26,26 +27,21 @@ jobs:
with:
lfs: true

- name: Set up Just
uses: extractions/setup-just@v2
- uses: cargo-bins/cargo-binstall@main

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
ruby-version: "3.3"
bundler-cache: true

- name: Set up Flutter FVM
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
with:
path: 'app/.fvmrc'
cache: false
- run: curl -fsSL https://fvm.app/install.sh | bash

- name: Install required Java version
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
distribution: "temurin"
java-version: "17"

- name: Cache Gradle dependencies
uses: actions/cache@v4
Expand All @@ -66,10 +62,11 @@ jobs:
with:
cache-directories: app/build/airapplogic/build

- run: cargo binstall cargo-ndk --no-confirm
- name: Set up Android CI
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: just setup-android-ci
run: cd app/fastlane && bundle install

- name: Build Android app
run: |
Expand All @@ -82,5 +79,5 @@ jobs:
- name: Upload Android app APK
uses: actions/upload-artifact@v4
with:
name: air-${{ steps.vars.outputs.sha_short }}
name: air-android-${{ steps.vars.outputs.sha_short }}
path: app/build/app/outputs/flutter-apk/app-release.apk
31 changes: 13 additions & 18 deletions .github/workflows/android_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ on:
branches:
- main
paths:
- 'coreclient/**'
- 'apiclient/**'
- 'applogic/**'
- 'common/**'
- 'app/**'
- 'Cargo.toml'
- "coreclient/**"
- "apiclient/**"
- "applogic/**"
- "common/**"
- "app/**"
- "Cargo.toml"
workflow_dispatch:

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
SQLX_OFFLINE: true

jobs:
android-publish:
Expand All @@ -35,33 +36,27 @@ jobs:
with:
lfs: true

- name: Set up Just
uses: extractions/setup-just@v2

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
ruby-version: "3.3"

- name: Set up Flutter FVM
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
with:
path: 'app/.fvmrc'
cache: false
- run: curl -fsSL https://fvm.app/install.sh | bash

- name: Install required Java version
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
distribution: "temurin"
java-version: "17"

- name: Set up Rust toolchain
uses: dtolnay/[email protected]

- run: cargo binstall cargo-ndk --no-confirm
- name: Set up Android CI
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: just setup-android-ci
run: cd app/fastlane && bundle install

- name: Build and upload to Play Store
env:
Expand Down
98 changes: 0 additions & 98 deletions .github/workflows/build.yml

This file was deleted.

77 changes: 77 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# SPDX-FileCopyrightText: 2025 Phoenix R&D GmbH <[email protected]>
#
# SPDX-License-Identifier: AGPL-3.0-or-later

name: CI

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
pull_request:
branches: ["main"]

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
SQLX_OFFLINE: true

jobs:
frb:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5

## CHECK FRB
- uses: dtolnay/[email protected]
- run: curl -fsSL https://fvm.app/install.sh | bash
- run: (cd app && fvm install)
- uses: actions/cache@v4
with:
path: ~/.cargo/bin/flutter_rust_bridge_codegen
key: cargo-install-${{ runner.os }}-frb-2.11.1
- run: if ! command -v flutter_rust_bridge_codegen; then cargo install [email protected]; fi
- uses: extractions/setup-just@v2
- run: just check-frb

flutter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
with:
lfs: true

# CHECK FLUTTER
- run: curl -fsSL https://fvm.app/install.sh | bash
- run: (cd app && fvm install)
- uses: extractions/setup-just@v2
- run: just check-flutter

# TEST FLUTTER
- run: just test-flutter
- uses: actions/upload-artifact@v4
if: failure()
with:
name: golden-failures
path: app/test/**/failures/*

rust:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5

# CHECK RUST
- uses: taiki-e/install-action@cargo-machete
- uses: dtolnay/[email protected]
- uses: cargo-bins/cargo-binstall@main
- run: cargo binstall [email protected] --no-confirm
- uses: Swatinem/rust-cache@v2
- run: pip3 install --user reuse
- run: pip3 install --user podman-compose
- uses: extractions/setup-just@v2
- run: just check-rust

# TEST RUST
- run: just start-docker-compose
- run: just test-rust
59 changes: 0 additions & 59 deletions .github/workflows/flutter_test.yml

This file was deleted.

Loading
Loading