From ebeede58d24100b576635525a69d31dc1e75120b Mon Sep 17 00:00:00 2001 From: Max Litruv Boonzaayer Date: Thu, 19 Feb 2026 18:07:40 +1100 Subject: [PATCH] fix: update build configuration for consistency and mark subproject as dirty --- .gitea/workflows/build.yml | 15 ++++++++------- cinny | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index f66f545..7d68f62 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -10,14 +10,14 @@ on: env: TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} - CARGO_INCREMENTAL: 0 + CARGO_INCREMENTAL: 1 CARGO_NET_RETRY: 10 RUSTUP_MAX_RETRIES: 10 jobs: check-version: - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/') + runs-on: linux + if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && !startsWith(github.ref, 'refs/tags/') outputs: should_release: ${{ steps.check.outputs.should_release }} version: ${{ steps.check.outputs.version }} @@ -49,6 +49,7 @@ jobs: uses: actions/checkout@v4 with: submodules: false + clean: false - name: Checkout submodules (Windows workaround) shell: powershell @@ -90,11 +91,11 @@ jobs: override: true - name: Install dependencies (root) - run: npm ci --prefer-offline + run: npm install --prefer-offline - name: Install dependencies (cinny) working-directory: ./cinny - run: npm ci --prefer-offline + run: npm install --prefer-offline - name: Build Tauri app run: npm run tauri build @@ -131,7 +132,7 @@ jobs: path: src-tauri/target/release/bundle/msi/Cinny-Windows-x64.msi.zip.sig build-linux: - runs-on: ubuntu-latest + runs-on: linux steps: - name: Checkout repository @@ -385,7 +386,7 @@ jobs: path: src-tauri/gen/android/app/build/outputs/apk/universal/release/Cinny-Android.apk create-release: - runs-on: ubuntu-latest + runs-on: linux needs: [check-version, build-windows, build-linux, build-android] if: needs.check-version.outputs.should_release == 'true' diff --git a/cinny b/cinny index 3f6f213..8f1ba61 160000 --- a/cinny +++ b/cinny @@ -1 +1 @@ -Subproject commit 3f6f2134ad7d24c2d784aeaaef8eee1360f5c9a3 +Subproject commit 8f1ba610fcc3d81d414cf165166d82350afaf6d1