starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Build with m2pro.large instances, not macos.m1.large.gen1 (#1020)

Browse Source 
* Update `com.circleci.v2` to `1.5.0` and `pkl.impl.circleci` to `1.2.0`

See:
- https://github.com/apple/pkl-pantry/pull/103
- https://github.com/apple/pkl-project-commons/pull/7

* Build with `m2pro.large` instances, not `macos.m1.large.gen1`
This commit is contained in:
Kushal Pisavadia
2025-03-11 10:20:43 +00:00
committed by Dan Chao
parent 7717b702b2
commit 0902cbc628
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.pkl
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.1.1#/PklCI.pkl" amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.2.0#/PklCI.pkl"
import "jobs/BuildNativeJob.pkl" import "jobs/BuildNativeJob.pkl"
import "jobs/GradleCheckJob.pkl" import "jobs/GradleCheckJob.pkl"

8
.circleci/config.yml
View File

@@ -34,7 +34,7 @@ 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: macos.m1.large.gen1 resource_class: m2pro.large
macos: macos:
xcode: 15.3.0 xcode: 15.3.0
pkl-cli-linux-amd64-release: pkl-cli-linux-amd64-release:
@@ -142,7 +142,7 @@ 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: macos.m1.large.gen1 resource_class: m2pro.large
macos: macos:
xcode: 15.3.0 xcode: 15.3.0
pkl-cli-linux-aarch64-release: pkl-cli-linux-aarch64-release:
@@ -347,7 +347,7 @@ 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: macos.m1.large.gen1 resource_class: m2pro.large
macos: macos:
xcode: 15.3.0 xcode: 15.3.0
pkl-cli-linux-amd64-snapshot: pkl-cli-linux-amd64-snapshot:
@@ -455,7 +455,7 @@ 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: macos.m1.large.gen1 resource_class: m2pro.large
macos: macos:
xcode: 15.3.0 xcode: 15.3.0
pkl-cli-linux-aarch64-snapshot: pkl-cli-linux-aarch64-snapshot:

4
.circleci/jobs/BuildNativeJob.pkl
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.1.2#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.5.0#/Config.pkl"
/// The architecture to use /// The architecture to use
arch: "amd64"|"aarch64" arch: "amd64"|"aarch64"
@@ -158,7 +158,7 @@ job {
macos { macos {
xcode = "15.3.0" xcode = "15.3.0"
} }
resource_class = "macos.m1.large.gen1" resource_class = "m2pro.large"
environment { environment {
["JAVA_HOME"] = "/Users/distiller/jdk/Contents/Home" ["JAVA_HOME"] = "/Users/distiller/jdk/Contents/Home"
} }

2
.circleci/jobs/DeployJob.pkl
View File

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

2
.circleci/jobs/GradleCheckJob.pkl
View File

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

2
.circleci/jobs/GradleJob.pkl
View File

@@ -15,7 +15,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
abstract module GradleJob abstract module GradleJob
import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.2#/Config.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/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.

2
.circleci/jobs/SimpleGradleJob.pkl
View File

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