From ef6594b88a6ff5e9dc01b64d0623a97c46791073 Mon Sep 17 00:00:00 2001 From: denis0001-dev Date: Sun, 13 Sep 2026 17:30:50 +0300 Subject: [PATCH] Inline CI setup steps; remove broken composite cargo cache action. Co-authored-by: Cursor --- .../actions/cache-cargo-windows/action.yml | 16 ----- .github/actions/setup-java-gradle/action.yml | 8 +-- .github/workflows/desktop-windows-x64.yml | 19 +++++- .github/workflows/release.yml | 60 ++++++++++++++++--- 4 files changed, 69 insertions(+), 34 deletions(-) delete mode 100644 .github/actions/cache-cargo-windows/action.yml diff --git a/.github/actions/cache-cargo-windows/action.yml b/.github/actions/cache-cargo-windows/action.yml deleted file mode 100644 index ad12342..0000000 --- a/.github/actions/cache-cargo-windows/action.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Cache Cargo (windows-setup) -description: Cache registry, git sources, and target/ for the Windows installer Rust workspace - -runs: - using: composite - steps: - - name: Cache Cargo - uses: actions/cache@v4 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - app/desktop/windows-setup/target - key: cargo-windows-${{ runner.os }}-${{ github.sha }} - restore-keys: | - cargo-windows-${{ runner.os }}- diff --git a/.github/actions/setup-java-gradle/action.yml b/.github/actions/setup-java-gradle/action.yml index 64fb816..8e5a45e 100644 --- a/.github/actions/setup-java-gradle/action.yml +++ b/.github/actions/setup-java-gradle/action.yml @@ -3,7 +3,7 @@ description: Temurin JDK 17 + Gradle wrapper with dependency and build cache inputs: java-architecture: - description: Optional JDK architecture (x64, arm64, …) + description: Optional JDK architecture (x64). Omit for host default. required: false default: "" @@ -11,16 +11,10 @@ runs: using: composite steps: - uses: actions/setup-java@v4 - if: ${{ inputs.java-architecture != '' && inputs.java-architecture != 'none' }} with: distribution: temurin java-version: "17" architecture: ${{ inputs.java-architecture }} - - uses: actions/setup-java@v4 - if: ${{ inputs.java-architecture == '' || inputs.java-architecture == 'none' }} - with: - distribution: temurin - java-version: "17" - uses: gradle/actions/setup-gradle@v4 with: diff --git a/.github/workflows/desktop-windows-x64.yml b/.github/workflows/desktop-windows-x64.yml index cd7fc9c..a9a4a7b 100644 --- a/.github/workflows/desktop-windows-x64.yml +++ b/.github/workflows/desktop-windows-x64.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8643441..894f3c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: