Skip to content

Commit 641d397

Browse files
committed
Update package, cleanups
1 parent b6ddd8c commit 641d397

File tree

8 files changed

+31
-140
lines changed

8 files changed

+31
-140
lines changed

.github/PklProject

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
amends "pkl:Project"
22

33
dependencies {
4-
["pkl.impl.ghactions"] = import("../../pkl-project-commons/packages/pkl.impl.ghactions/PklProject")
5-
// {
6-
// uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.4.2"
7-
// }
4+
["pkl.impl.ghactions"] {
5+
uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.6.0"
6+
}
87
["gha"] {
98
uri = "package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0.0.6"
109
}

.github/PklProject.deps.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
}
1010
},
1111
"package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0": {
12-
"type": "local",
13-
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.5.0",
14-
"path": "../../pkl-project-commons/packages/pkl.impl.ghactions"
12+
"type": "remote",
13+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.6.0",
14+
"checksums": {
15+
"sha256": "410db569a518ff7e5bb155ec6dc9b10bed3f28fed248bd09e84e4ce26b507aca"
16+
}
1517
}
1618
}
1719
}

.github/jobs/GradleJob.pkl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ arch: "amd64" | "aarch64" = "amd64"
1515
/// The OS to run on.
1616
os: "macOS" | "linux" | "windows" = "linux"
1717

18+
// TODO flip this to `true` when nightly macOS is available
1819
/// Whether to run on nightly macOS.
19-
nightlyMacOS: Boolean(implies(os == "macOS")) = true
20+
nightlyMacOS: Boolean(implies(os == "macOS")) = false
2021

2122
extraGradleArgs: Listing<String>
2223

2324
steps: Listing<*Workflow.Step | Workflow.TypedStep>
2425

25-
/// The fetch depth to use
26-
fetchDepth: Int = 1
26+
/// The fetch depth to use when doing a git checkout.
27+
fetchDepth: Int?
2728

2829
fixed gradleArgs =
2930
new Listing {
@@ -69,8 +70,10 @@ fixed job {
6970
steps {
7071
// full checkout (needed for spotless)
7172
new Common.Checkout {
72-
with {
73-
`fetch-depth` = 0
73+
when (fetchDepth != null) {
74+
with {
75+
`fetch-depth` = fetchDepth
76+
}
7477
}
7578
}
7679
new Setup.Java {

.github/workflows/build.yml

Lines changed: 3 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/main.yml

Lines changed: 3 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)