fixup! build graph and native build in ci

Signed-off-by: Sam Gammon <[email protected]>
elide-dev · Feb 21, 2024 · 81ddeb0 · 81ddeb0
1 parent 4bcdea8
commit 81ddeb0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/job.native-build.yml b/.github/workflows/job.native-build.yml
@@ -23,20 +23,20 @@ jobs:
         os: [Ubuntu]
         mode: ["Strict"]
         machine: ["ubuntu-latest"]
-        target: ["linuxExecutableAmd64"]
+        target: [":pkl-cli:linuxExecutableAmd64"]
         include:
           - os: macOS x64
             mode: Strict
             machine: macos-13
-            target: macExecutableAmd64
+            target: :pkl-cli:macExecutableAmd64
           - os: macOS aarch64
             mode: Strict
             machine: macos-13-xlarge
-            target: macExecutableAarch64
+            target: :pkl-cli:macExecutableAarch64
           - os: Windows
             mode: Strict
             machine: windows-latest
-            target: windowsAmd64
+            target: :pkl-cli:windowsAmd64
 
     name: "Native CLI (${{ matrix.os }})"
     runs-on: ${{ matrix.machine }}
@@ -103,9 +103,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }}
           dependency-graph: generate-and-submit
           gradle-home-cache-cleanup: true
-          arguments: dependencies build -x test -x check --scan
-      - name: "🛠️ Dependency Graph"
-        uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+          arguments: ${{ matrix.target || ':pkl-cli:assembleNative' }}
         continue-on-error: true
       - name: "Artifact: Caches"
         uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0

diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml
@@ -73,8 +73,21 @@ jobs:
     secrets:
       GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }}
     permissions:
+      ## Needed for build graph publishing
       contents: "write"
 
+  ##
+  ## Job: Native Build
+  ##
+  native-build:
+    name: "Build"
+    uses: ./.github/workflows/job.native-build.yml
+    needs: [preflight-checks, dependency-graph]
+    secrets:
+      GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }}
+    permissions:
+      contents: "read"
+
   ##
   ## Job: API Check
   ##