mirror of
https://github.com/apple/pkl.git
synced 2026-03-26 02:51:13 +01:00
Fix release builds (#1317)
In order to preserve the folder hierarchy in our uploaded artifact, we need to insert a wildcard in the root path. Also, fix fan-in of tasks that lead to the publish test result task.
This commit is contained in:
10
.github/jobs/BuildNativeJob.pkl
vendored
10
.github/jobs/BuildNativeJob.pkl
vendored
@@ -17,7 +17,6 @@ extraGradleArgs {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
steps {
|
||||
when (musl) {
|
||||
new {
|
||||
@@ -28,10 +27,7 @@ steps {
|
||||
new {
|
||||
name = "gradle buildNative"
|
||||
shell = "bash"
|
||||
run =
|
||||
"""
|
||||
./gradlew \(module.gradleArgs) \(project):buildNative
|
||||
"""
|
||||
run = "./gradlew \(module.gradleArgs) \(project):buildNative"
|
||||
}
|
||||
new Artifact.Upload {
|
||||
name = "Upload executable artifacts"
|
||||
@@ -41,7 +37,9 @@ steps {
|
||||
"executable-\(project)-alpine-\(module.os)-\(module.arch)"
|
||||
else
|
||||
"executable-\(project)-\(module.os)-\(module.arch)"
|
||||
path = "\(project)/build/executable/**/*"
|
||||
// Need to insert a wildcard to make actions/upload-artifact preserve the folder hierarchy.
|
||||
// See https://github.com/actions/upload-artifact/issues/206
|
||||
path = "\(project)*/build/executable/**/*"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
4
.github/jobs/PklJob.pkl
vendored
4
.github/jobs/PklJob.pkl
vendored
@@ -1,6 +1,6 @@
|
||||
abstract module PklJob
|
||||
|
||||
import "@gha/Workflow.pkl"
|
||||
extends "@pkl.impl.ghactions/jobs/PklJob.pkl"
|
||||
|
||||
/// Identify any jobs that must complete successfully before this job will run.
|
||||
///
|
||||
@@ -23,7 +23,7 @@ needs: (String | *Listing<String>)?
|
||||
`if`: String?
|
||||
|
||||
/// The underlying workflow job
|
||||
fixed job: Workflow.Job = new {
|
||||
fixed job {
|
||||
`if` = module.`if`
|
||||
needs = module.needs
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user