Inline CI setup steps; remove broken composite cargo cache action.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-09-13 17:30:50 +03:00
Unverified
parent 9f216e0655
commit ef6594b88a
4 changed files with 69 additions and 34 deletions
+17 -2
View File
@@ -24,11 +24,26 @@ jobs:
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java-gradle
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "17"
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
- uses: dtolnay/rust-toolchain@stable
with:
targets: x86_64-pc-windows-msvc
- uses: ./.github/actions/cache-cargo-windows
- name: Cache Cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
app/desktop/windows-setup/target
key: cargo-windows-${{ runner.os }}-${{ hashFiles('app/desktop/windows-setup/Cargo.lock') }}
restore-keys: |
cargo-windows-${{ runner.os }}-
- id: ver
name: Resolve version
shell: bash
+51 -9
View File
@@ -54,14 +54,29 @@ jobs:
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java-gradle
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "17"
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
- uses: ./.github/actions/set-version
with:
version: ${{ needs.resolve-version.outputs.version }}
- uses: dtolnay/rust-toolchain@stable
with:
targets: x86_64-pc-windows-msvc
- uses: ./.github/actions/cache-cargo-windows
- name: Cache Cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
app/desktop/windows-setup/target
key: cargo-windows-${{ runner.os }}-${{ hashFiles('app/desktop/windows-setup/Cargo.lock') }}
restore-keys: |
cargo-windows-${{ runner.os }}-
- name: Build arch-independent Windows tooling and compile JVM
shell: bash
run: |
@@ -96,7 +111,13 @@ jobs:
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java-gradle
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "17"
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
- uses: ./.github/actions/set-version
with:
version: ${{ needs.resolve-version.outputs.version }}
@@ -140,16 +161,25 @@ jobs:
matrix:
include:
- arch: arm64
java-architecture: none
- arch: x64
java-architecture: x64
runs-on: macos-latest
timeout-minutes: 90
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java-gradle
- uses: actions/setup-java@v4
if: matrix.arch == 'x64'
with:
java-architecture: ${{ matrix.java-architecture }}
distribution: temurin
java-version: "17"
architecture: x64
- uses: actions/setup-java@v4
if: matrix.arch == 'arm64'
with:
distribution: temurin
java-version: "17"
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
- uses: ./.github/actions/set-version
with:
version: ${{ needs.resolve-version.outputs.version }}
@@ -197,7 +227,13 @@ jobs:
timeout-minutes: 75
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java-gradle
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "17"
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
- uses: ./.github/actions/set-version
with:
version: ${{ needs.resolve-version.outputs.version }}
@@ -232,7 +268,13 @@ jobs:
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-java-gradle
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "17"
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
- uses: android-actions/setup-android@v3
- uses: ./.github/actions/set-version
with: