Update macOS release in CI (#1243)

This commit is contained in:
Jen Basch
2025-10-16 15:48:23 -07:00
committed by GitHub
parent 80a4dc9617
commit bed008b3da
7 changed files with 24 additions and 24 deletions

View File

@@ -14,7 +14,7 @@
// limitations under the License. // limitations under the License.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// File gets rendered to .circleci/config.yml via git hook. // File gets rendered to .circleci/config.yml via git hook.
amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.2.0#/PklCI.pkl" amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.2.1#/PklCI.pkl"
import "jobs/BuildNativeJob.pkl" import "jobs/BuildNativeJob.pkl"
import "jobs/DeployJob.pkl" import "jobs/DeployJob.pkl"

View File

@@ -34,9 +34,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-cli-linux-amd64-release: pkl-cli-linux-amd64-release:
steps: steps:
- checkout - checkout
@@ -142,9 +142,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-cli-linux-aarch64-release: pkl-cli-linux-aarch64-release:
steps: steps:
- checkout - checkout
@@ -347,9 +347,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-doc-linux-amd64-release: pkl-doc-linux-amd64-release:
steps: steps:
- checkout - checkout
@@ -455,9 +455,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-doc-linux-aarch64-release: pkl-doc-linux-aarch64-release:
steps: steps:
- checkout - checkout
@@ -660,9 +660,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-cli-linux-amd64-snapshot: pkl-cli-linux-amd64-snapshot:
steps: steps:
- checkout - checkout
@@ -768,9 +768,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-cli-linux-aarch64-snapshot: pkl-cli-linux-aarch64-snapshot:
steps: steps:
- checkout - checkout
@@ -973,9 +973,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-doc-linux-amd64-snapshot: pkl-doc-linux-amd64-snapshot:
steps: steps:
- checkout - checkout
@@ -1081,9 +1081,9 @@ jobs:
environment: environment:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
JAVA_HOME: /Users/distiller/jdk/Contents/Home JAVA_HOME: /Users/distiller/jdk/Contents/Home
resource_class: m2pro.large resource_class: m4pro.large
macos: macos:
xcode: 15.3.0 xcode: 26.0.1
pkl-doc-linux-aarch64-snapshot: pkl-doc-linux-aarch64-snapshot:
steps: steps:
- checkout - checkout

View File

@@ -16,7 +16,7 @@
/// Builds the native `pkl` CLI /// Builds the native `pkl` CLI
extends "GradleJob.pkl" extends "GradleJob.pkl"
import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.5.0#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.7.0#/Config.pkl"
/// The architecture to use /// The architecture to use
arch: "amd64" | "aarch64" arch: "amd64" | "aarch64"
@@ -172,9 +172,9 @@ steps {
job { job {
when (os == "macOS") { when (os == "macOS") {
macos { macos {
xcode = "15.3.0" xcode = "26.0.1"
} }
resource_class = "m2pro.large" resource_class = "m4pro.large"
environment { environment {
["JAVA_HOME"] = "/Users/distiller/jdk/Contents/Home" ["JAVA_HOME"] = "/Users/distiller/jdk/Contents/Home"
} }

View File

@@ -15,7 +15,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
extends "GradleJob.pkl" extends "GradleJob.pkl"
import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.5.0#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.7.0#/Config.pkl"
local self = this local self = this

View File

@@ -15,7 +15,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
extends "GradleJob.pkl" extends "GradleJob.pkl"
import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.5.0#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.7.0#/Config.pkl"
steps { steps {
new Config.RunStep { new Config.RunStep {

View File

@@ -15,7 +15,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
abstract module GradleJob abstract module GradleJob
import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.5.0#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.7.0#/Config.pkl"
import "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.3#/URI.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.3#/URI.pkl"
/// Whether this is a release build or not. /// Whether this is a release build or not.

View File

@@ -15,7 +15,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
extends "GradleJob.pkl" extends "GradleJob.pkl"
import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.5.0#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.7.0#/Config.pkl"
name: String = command name: String = command