diff --git a/.github/actions/restore-jvm-compile-outputs/action.yml b/.github/actions/restore-jvm-compile-outputs/action.yml index e2d6b38..9cb22e1 100644 --- a/.github/actions/restore-jvm-compile-outputs/action.yml +++ b/.github/actions/restore-jvm-compile-outputs/action.yml @@ -1,9 +1,18 @@ name: Restore JVM compile outputs -description: Verify JVM compile outputs from the Build JAR artifact are present before packaging +description: Extract and verify JVM compile outputs from the Build JAR artifact before packaging runs: using: composite steps: + - name: Extract JVM compile outputs + shell: bash + run: | + set -euo pipefail + if [[ -f jvm-compile-outputs.tar.gz ]]; then + tar -xzf jvm-compile-outputs.tar.gz + elif [[ -f jvm-compile-outputs/jvm-compile-outputs.tar.gz ]]; then + tar -xzf jvm-compile-outputs/jvm-compile-outputs.tar.gz + fi - name: Verify JVM compile outputs shell: bash run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1bf97a1..d25bc83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -171,6 +171,13 @@ jobs: scope: build-jar - name: Compile and ProGuard release desktop jars run: ./gradlew :app:desktop:exportReleaseProguardForCi --no-daemon --console=plain + - name: Archive JVM compile outputs + run: | + set -euo pipefail + tar -czf jvm-compile-outputs.tar.gz \ + app/shared/build \ + app/desktop/build/classes \ + app/desktop/build/libs - uses: ./.github/actions/save-gradle-build-cache if: always() with: @@ -184,11 +191,7 @@ jobs: - uses: actions/upload-artifact@v5 with: name: jvm-compile-outputs - path: | - app/shared/build - app/desktop/build/classes - app/desktop/build/libs - include-hidden-files: true + path: jvm-compile-outputs.tar.gz if-no-files-found: error retention-days: 3 diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts index 32a30d0..683635a 100644 --- a/app/desktop/build.gradle.kts +++ b/app/desktop/build.gradle.kts @@ -1170,7 +1170,7 @@ val packageLinuxAppImage = tasks.register("packageLinuxAppImage") { fi ARCH="$(uname -m)" export ARCH - "$TOOL" "$${stage.absolutePath}" "$${out.absolutePath}" + "$TOOL" --no-check-permissions "$${stage.absolutePath}" "$${out.absolutePath}" """.trimIndent(), ) } diff --git a/scripts/package-ios-ipa.sh b/scripts/package-ios-ipa.sh index 1da0797..cbb8c3c 100755 --- a/scripts/package-ios-ipa.sh +++ b/scripts/package-ios-ipa.sh @@ -36,7 +36,8 @@ PRODUCTS_DIR="$BUILD_DIR/Build/Products/Release-iphoneos" mkdir -p "$PRODUCTS_DIR" export CONFIGURATION=Release -export SDK_NAME="$(xcrun --sdk iphoneos --show-sdk-name)" +SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version)" +export SDK_NAME="iphoneos${SDK_VERSION}" export ARCHS=arm64 export PLATFORM_NAME=iphoneos export EFFECTIVE_PLATFORM_NAME=-iphoneos