Unverified Commit c1f81974 authored by Oleksandr Karpovich's avatar Oleksandr Karpovich Committed by GitHub

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.
parent 2d41c8df
...@@ -38,6 +38,11 @@ jobs: ...@@ -38,6 +38,11 @@ jobs:
./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal ./gradlew --stacktrace --info -Pskiko.native.enabled=true :skiko:publishToMavenLocal
./gradlew --stacktrace --info :SkiaAwtSample:installDist ./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 - uses: actions/upload-artifact@v3
name: 'Save test results as artifact' name: 'Save test results as artifact'
if: always() if: always()
......
...@@ -50,7 +50,7 @@ fun SkikoProjectContext.declareSkiaTasks() { ...@@ -50,7 +50,7 @@ fun SkikoProjectContext.declareSkiaTasks() {
onlyIfModified(true) onlyIfModified(true)
src(skiaUrl) src(skiaUrl)
dest(skiko.dependenciesDir.resolve( dest(skiko.dependenciesDir.resolve(
"skia/$skiaReleaseTag/Skia-$skiaReleaseTag-$config-Release-${arch}.zip") "skia/$skiaReleaseTag/Skia-$skiaReleaseTag-$config-$buildType-${arch}.zip")
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment