From c1f8197437e86369929936753a8469b558d152be Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Mon, 5 Aug 2024 11:30:00 +0200 Subject: [PATCH] Fix skia download destination directory (#971) The download directory path now depends on the buildType: Debug and Release ___ It affected our buildServer CI pipeline where it builds Release first and then Debug. And downloadTask was considered UP-TO-DATE when Debug build was attempted. Therefore the build used "Release" version of skia instead of "Debug. " Added a Debug build to the githiub workflow too. --- .github/workflows/ci.yml | 5 +++++ skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb8e84623..913d07811 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,11 @@ jobs: ./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal ./gradlew --stacktrace --info :SkiaAwtSample:installDist + - shell: bash + name: 'Publish Debug to Maven Local' + run: | + ./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal -Pskiko.debug=true + - uses: actions/upload-artifact@v3 name: 'Save test results as artifact' if: always() diff --git a/skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt b/skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt index 6221c9ac3..42e0026fc 100644 --- a/skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt +++ b/skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt @@ -50,7 +50,7 @@ fun SkikoProjectContext.declareSkiaTasks() { onlyIfModified(true) src(skiaUrl) dest(skiko.dependenciesDir.resolve( - "skia/$skiaReleaseTag/Skia-$skiaReleaseTag-$config-Release-${arch}.zip") + "skia/$skiaReleaseTag/Skia-$skiaReleaseTag-$config-$buildType-${arch}.zip") ) }