Bump pkl.impl.ghactions to 1.0.1 (#1358)

Author: bioball

.github/PklProject

@@ -2,9 +2,9 @@ amends "pkl:Project"
 
 dependencies {
   ["pkl.impl.ghactions"] {
-    uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.7.1"
+    uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.0.1"
   }
   ["gha"] {
-    uri = "package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.[email protected]"
+    uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.[email protected]"
   }
 }

.github/PklProject.deps.json

@@ -1,18 +1,18 @@
 {
   "schemaVersion": 1,
   "resolvedDependencies": {
-    "package://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.action@0": {
+    "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1": {
       "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/github.com/stefma/pkl-gha/com.github.[email protected]",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.[email protected]",
       "checksums": {
-        "sha256": "84365239996740252a91abab084d443aa3a3438f375b667ac16cb765461c1555"
+        "sha256": "efe5b1f58648baeac651e88107e13ceb58860c8e28ac18098b857445dc0185b7"
       }
     },
-    "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0": {
+    "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": {
       "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@0.7.1",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.0.1",
       "checksums": {
-        "sha256": "f8efc4b174855a2fafdab8ed792de4b0cb89b0516d688c8540eea13af20e0f80"
+        "sha256": "f6fcf3e3e580520ad526b92274c373a78f4ced3d2b0dd52e422fc3e0847f307f"
       }
     }
   }

.github/index.pkl

@@ -196,27 +196,3 @@ release {
       }
     } |> toWorkflowJobs
 }
-
-output {
-  files {
-    [[true]] {
-      renderer {
-        converters {
-          ["jobs"] = (it: Mapping<String, Workflow.Job>) ->
-            it
-              .toMap()
-              .mapValues((name, job) ->
-                if (name.contains("linux") && !name.contains("alpine"))
-                  job
-                    .toMap()
-                    .put("container", new Dynamic {
-                      image = "redhat/ubi8:8.10"
-                    })
-                else
-                  job
-              )
-        }
-      }
-    }
-  }
-}

.github/jobs/BuildJavaExecutableJob.pkl

@@ -1,7 +1,6 @@
 extends "GradleJob.pkl"
 
-import "@gha/actions/Artifact.pkl"
-import "@gha/actions/Common.pkl"
+import "@gha/catalog.pkl"
 
 // Keep this in sync with projects that build java executables
 local projects: List<String> = List("pkl-doc", "pkl-cli", "pkl-codegen-java", "pkl-codegen-kotlin")
@@ -17,13 +16,13 @@ local command =
   }.join(" ")
 
 steps {
-  new Common.Checkout {}
+  catalog.`actions/checkout@v6`
   new {
     name = "gradle build java executables"
     shell = "bash"
     run = command
   }
-  new Artifact.Upload {
+  (catalog.`actions/upload-artifact@v5`) {
     name = "Upload executable artifacts"
     with {
       name = "executable-java"

.github/jobs/BuildNativeJob.pkl

@@ -1,7 +1,7 @@
 extends "GradleJob.pkl"
 
-import "@gha/actions/Artifact.pkl"
-import "@gha/Context.pkl"
+import "@gha/catalog.pkl"
+import "@gha/context.pkl"
 
 /// Whether to link to musl. Otherwise, links to glibc.
 musl: Boolean(implies(module.os == "linux")) = false
@@ -12,7 +12,7 @@ project: String
 extraGradleArgs {
   when (os == "macOS" && arch == "amd64") {
     "-Dpkl.targetArch=\(module.arch)"
-    "-Dpkl.native--native-compiler-path=\(Context.github.workspace)/.github/scripts/cc_macos_amd64.sh"
+    "-Dpkl.native--native-compiler-path=\(context.github.workspace)/.github/scripts/cc_macos_amd64.sh"
   }
   when (musl) {
     "-Dpkl.musl=true"
@@ -48,7 +48,7 @@ steps {
     shell = "bash"
     run = "./gradlew \(module.gradleArgs) \(project):buildNative"
   }
-  new Artifact.Upload {
+  (catalog.`actions/upload-artifact@v5`) {
     name = "Upload executable artifacts"
     with {
       name =
@@ -62,3 +62,11 @@ steps {
     }
   }
 }
+
+fixed job {
+  when (os == "linux" && !musl) {
+    container {
+      image = "redhat/ubi8:8.10"
+    }
+  }
+}

.github/jobs/DeployJob.pkl

@@ -1,7 +1,6 @@
 extends "GradleJob.pkl"
 
-import "@gha/actions/Artifact.pkl"
-import "@gha/actions/Common.pkl"
+import "@gha/catalog.pkl"
 import "@gha/Workflow.pkl"
 import "@pkl.impl.ghactions/helpers.pkl"
 
@@ -14,8 +13,8 @@ arch = "amd64"
 os = "linux"
 
 steps {
-  new Common.Checkout {}
-  new Artifact.Download {
+  catalog.`actions/checkout@v6`
+  (catalog.`actions/download-artifact@v5`) {
     with {
       pattern = "executable-**"
       `merge-multiple` = true

.github/jobs/GithubRelease.pkl

@@ -2,8 +2,8 @@ module GithubRelease
 
 extends "PklJob.pkl"
 
-import "@gha/actions/Artifact.pkl"
-import "@gha/Context.pkl"
+import "@gha/catalog.pkl"
+import "@gha/context.pkl"
 
 fixed job {
   `runs-on` = "ubuntu-latest"
@@ -12,7 +12,7 @@ fixed job {
   }
   needs = "deploy-release"
   steps {
-    new Artifact.Download {
+    (catalog.`actions/download-artifact@v5`) {
       with {
         pattern = "executable-**"
         `merge-multiple` = true
@@ -21,10 +21,10 @@ fixed job {
     new {
       name = "Publish release on GitHub"
       env {
-        ["GH_TOKEN"] = Context.github.token
-        ["TAG_NAME"] = Context.github.refName
-        ["GIT_SHA"] = Context.github.sha
-        ["GH_REPO"] = Context.github.repository
+        ["GH_TOKEN"] = context.github.token
+        ["TAG_NAME"] = context.github.refName
+        ["GIT_SHA"] = context.github.sha
+        ["GH_REPO"] = context.github.repository
       }
       // language=bash
       run =

.github/jobs/GradleJob.pkl

@@ -2,9 +2,8 @@ abstract module GradleJob
 
 extends "PklJob.pkl"
 
-import "@gha/actions/Common.pkl"
-import "@gha/actions/Setup.pkl"
 import "@gha/Workflow.pkl"
+import "@gha/catalog.pkl"
 
 /// Whether this is a release build or not.
 isRelease: Boolean = false
@@ -21,9 +20,9 @@ nightlyMacOS: Boolean(implies(os == "macOS")) = false
 
 extraGradleArgs: Listing<String>
 
-steps: Listing<*Workflow.Step | Workflow.TypedStep>
+steps: Listing<Workflow.Step>
 
-preSteps: Listing<*Workflow.Step | Workflow.TypedStep>
+preSteps: Listing<Workflow.Step>
 
 /// The fetch depth to use when doing a git checkout.
 fetchDepth: Int?
@@ -73,14 +72,14 @@ fixed job {
   steps {
     ...preSteps
     // full checkout (needed for spotless)
-    new Common.Checkout {
+    (catalog.`actions/checkout@v6`) {
       when (fetchDepth != null) {
         with {
           `fetch-depth` = fetchDepth
         }
       }
     }
-    new Setup.Java {
+    (catalog.`actions/setup-java@v5`) {
       with {
         `java-version` = "21"
         distribution = "temurin"