Skip to content

Commit

Permalink
Fix skia download destination directory (#971)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
eymar authored Aug 5, 2024
1 parent 2d41c8d commit c1f8197
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
}

Expand Down

0 comments on commit c1f8197

Please sign in to comment.