From 5a22ccc0ceace5782db403e179478aec3dc5a9df Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 3 Feb 2025 17:36:30 -0800 Subject: [PATCH 1/7] fix: graalvm checksum for `linux-aarch64` Checksums taken during #876 ended up out of date due to the release of GraalVM `21.1.2` (the PR was built against `21.1.1`). These checksums are calculated from the GraalVM download page directly: https://www.graalvm.org/downloads/ On Linux: ``` sha256sum graalvm-... ``` Signed-off-by: Sam Gammon --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95f819994..927551371 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ graalVmJdkVersion = "21.0.5" graalVmSha256-macos-x64 = "2d9b09e28bc1bb6ff219bf62eacc4626c7740b4f1829ede9ea4450f33e9c0826" graalVmSha256-macos-aarch64 = "cb68cb2c796f42f37a56fcd1385d8b86cca12e0b46c5618a5ed3ec7dd2260f6f" graalVmSha256-linux-x64 = "c1960d4f9d278458bde1cd15115ac2f0b3240cb427d51cfeceb79dab91a7f5c9" -graalVmSha256-linux-aarch64 = "771b308852853cf93f7a3fc429741dd17502b8c5fa91930de6af8ded461e2dc3" +graalVmSha256-linux-aarch64 = "3ad68fbb2d13da528dfa0aea9e9345383245ec9c31094dce3905cefba9aac01e" graalVmSha256-windows-x64 = "d5784cbdc87f84b5cbd6c9d09c6f1d4611954f139fcfc795005c58dffd7f6b41" ideaExtPlugin = "1.1.9" javaPoet = "0.+" From f35bcbacaa05a6e31ef93e9bcf09c8dfc4a89186 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 3 Feb 2025 18:21:52 -0800 Subject: [PATCH 2/7] fix: install jdk21 during mac ci runs Signed-off-by: Sam Gammon --- .circleci/config.yml | 80 +++++++++++++++++++++++++++++++ .circleci/jobs/BuildNativeJob.pkl | 43 ++++++++++++++--- 2 files changed, 117 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e3348542..b302f6a87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,26 @@ jobs: - run: command: /usr/sbin/softwareupdate --install-rosetta --agree-to-license name: Installing Rosetta 2 + - run: + command: |- + # install jdk + curl -Lf \ + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz + + mkdir $HOME/jdk \ + && cd $HOME/jdk \ + && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . + + export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" + export JAVA_HOME="$JAVA_ROOT/Contents/Home" + export PATH="$JAVA_HOME/bin:$PATH" + mv $HOME/jdk $JAVA_ROOT + /usr/libexec/java_home -V + java -version + mkdir -p $HOME/.gradle + echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties + name: Set up environment + shell: '#!/bin/bash -exo pipefail' - run: command: |- export PATH=~/staticdeps/bin:$PATH @@ -105,6 +125,26 @@ jobs: pkl-cli-macOS-aarch64-release: steps: - checkout + - run: + command: |- + # install jdk + curl -Lf \ + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz + + mkdir $HOME/jdk \ + && cd $HOME/jdk \ + && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . + + export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" + export JAVA_HOME="$JAVA_ROOT/Contents/Home" + export PATH="$JAVA_HOME/bin:$PATH" + mv $HOME/jdk $JAVA_ROOT + /usr/libexec/java_home -V + java -version + mkdir -p $HOME/.gradle + echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties + name: Set up environment + shell: '#!/bin/bash -exo pipefail' - run: command: |- export PATH=~/staticdeps/bin:$PATH @@ -298,6 +338,26 @@ jobs: - run: command: /usr/sbin/softwareupdate --install-rosetta --agree-to-license name: Installing Rosetta 2 + - run: + command: |- + # install jdk + curl -Lf \ + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz + + mkdir $HOME/jdk \ + && cd $HOME/jdk \ + && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . + + export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" + export JAVA_HOME="$JAVA_ROOT/Contents/Home" + export PATH="$JAVA_HOME/bin:$PATH" + mv $HOME/jdk $JAVA_ROOT + /usr/libexec/java_home -V + java -version + mkdir -p $HOME/.gradle + echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties + name: Set up environment + shell: '#!/bin/bash -exo pipefail' - run: command: |- export PATH=~/staticdeps/bin:$PATH @@ -394,6 +454,26 @@ jobs: pkl-cli-macOS-aarch64-snapshot: steps: - checkout + - run: + command: |- + # install jdk + curl -Lf \ + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz -o /tmp/jdk.tar.gz + + mkdir $HOME/jdk \ + && cd $HOME/jdk \ + && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . + + export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" + export JAVA_HOME="$JAVA_ROOT/Contents/Home" + export PATH="$JAVA_HOME/bin:$PATH" + mv $HOME/jdk $JAVA_ROOT + /usr/libexec/java_home -V + java -version + mkdir -p $HOME/.gradle + echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties + name: Set up environment + shell: '#!/bin/bash -exo pipefail' - run: command: |- export PATH=~/staticdeps/bin:$PATH diff --git a/.circleci/jobs/BuildNativeJob.pkl b/.circleci/jobs/BuildNativeJob.pkl index b630587fb..a0eb72f4b 100644 --- a/.circleci/jobs/BuildNativeJob.pkl +++ b/.circleci/jobs/BuildNativeJob.pkl @@ -87,6 +87,34 @@ local setupLinuxEnvironment: Config.RunStep = }.join("\n\n") } +local setupMacEnvironment: Config.RunStep = + let (muslVersion = "1.2.2") + let (zlibVersion = "1.2.13") + new { + name = "Set up environment" + shell = "#!/bin/bash -exo pipefail" + command = new Listing { + #""" + # install jdk + curl -Lf \ + https://github.com/adoptium/temurin\#(module.majorJdkVersion)-binaries/releases/download/\#(module.jdkGitHubReleaseName)/OpenJDK\#(module.majorJdkVersion)U-jdk_\#(if (arch == "amd64") "x64" else "aarch64")_mac_hotspot_\#(module.jdkVersionAlt).tar.gz -o /tmp/jdk.tar.gz + + mkdir $HOME/jdk \ + && cd $HOME/jdk \ + && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . + + export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-\#(module.majorJdkVersion).jdk" + export JAVA_HOME="$JAVA_ROOT/Contents/Home" + export PATH="$JAVA_HOME/bin:$PATH" + mv $HOME/jdk $JAVA_ROOT + /usr/libexec/java_home -V + java -version + mkdir -p $HOME/.gradle + echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties + """# + }.join("\n\n") + } + steps { when (os == "linux") { new Config.RestoreCacheStep { @@ -102,13 +130,16 @@ steps { } } } - when (os == "macOS" && arch == "amd64") { - new Config.RunStep { - name = "Installing Rosetta 2" - command = """ - /usr/sbin/softwareupdate --install-rosetta --agree-to-license - """ + when (os == "macOS") { + when (arch == "amd64") { + new Config.RunStep { + name = "Installing Rosetta 2" + command = """ + /usr/sbin/softwareupdate --install-rosetta --agree-to-license + """ + } } + setupMacEnvironment } new Config.RunStep { name = "gradle buildNative" From 294d5b64dfb928c521615c0a7b21067e4ae6b9cd Mon Sep 17 00:00:00 2001 From: Dan Chao Date: Mon, 3 Feb 2025 20:21:58 -0800 Subject: [PATCH 3/7] Fixes --- .circleci/config.pkl | 4 ++- .circleci/config.yml | 53 ++++++++++--------------------- .circleci/jobs/BuildNativeJob.pkl | 43 ++++++++++--------------- 3 files changed, 37 insertions(+), 63 deletions(-) diff --git a/.circleci/config.pkl b/.circleci/config.pkl index ebe9ae1c5..89621e60b 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -21,7 +21,9 @@ import "jobs/GradleCheckJob.pkl" import "jobs/DeployJob.pkl" import "jobs/SimpleGradleJob.pkl" -local prbJobs: Listing = gradleCheckJobs.keys.toListing() +local prbJobs: Listing = (gradleCheckJobs.keys.toListing()) { + "pkl-cli-macOS-aarch64-snapshot" +} local buildAndTestJobs = (prbJobs) { "bench" diff --git a/.circleci/config.yml b/.circleci/config.yml index b302f6a87..e2cc1a08e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,15 +18,6 @@ jobs: mkdir $HOME/jdk \ && cd $HOME/jdk \ && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . - - export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" - export JAVA_HOME="$JAVA_ROOT/Contents/Home" - export PATH="$JAVA_HOME/bin:$PATH" - mv $HOME/jdk $JAVA_ROOT - /usr/libexec/java_home -V - java -version - mkdir -p $HOME/.gradle - echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties name: Set up environment shell: '#!/bin/bash -exo pipefail' - run: @@ -42,6 +33,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 + JAVA_HOME: ~/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -134,15 +126,6 @@ jobs: mkdir $HOME/jdk \ && cd $HOME/jdk \ && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . - - export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" - export JAVA_HOME="$JAVA_ROOT/Contents/Home" - export PATH="$JAVA_HOME/bin:$PATH" - mv $HOME/jdk $JAVA_ROOT - /usr/libexec/java_home -V - java -version - mkdir -p $HOME/.gradle - echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties name: Set up environment shell: '#!/bin/bash -exo pipefail' - run: @@ -158,6 +141,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 + JAVA_HOME: ~/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -347,15 +331,6 @@ jobs: mkdir $HOME/jdk \ && cd $HOME/jdk \ && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . - - export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" - export JAVA_HOME="$JAVA_ROOT/Contents/Home" - export PATH="$JAVA_HOME/bin:$PATH" - mv $HOME/jdk $JAVA_ROOT - /usr/libexec/java_home -V - java -version - mkdir -p $HOME/.gradle - echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties name: Set up environment shell: '#!/bin/bash -exo pipefail' - run: @@ -371,6 +346,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 + JAVA_HOME: ~/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -463,15 +439,6 @@ jobs: mkdir $HOME/jdk \ && cd $HOME/jdk \ && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . - - export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-21.jdk" - export JAVA_HOME="$JAVA_ROOT/Contents/Home" - export PATH="$JAVA_HOME/bin:$PATH" - mv $HOME/jdk $JAVA_ROOT - /usr/libexec/java_home -V - java -version - mkdir -p $HOME/.gradle - echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties name: Set up environment shell: '#!/bin/bash -exo pipefail' - run: @@ -487,6 +454,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 + JAVA_HOME: ~/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -816,6 +784,9 @@ workflows: - gradle-check-windows: requires: - hold + - pkl-cli-macOS-aarch64-snapshot: + requires: + - hold when: matches: value: << pipeline.git.branch >> @@ -824,6 +795,7 @@ workflows: jobs: - gradle-check - gradle-check-windows + - pkl-cli-macOS-aarch64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-snapshot @@ -836,6 +808,7 @@ workflows: requires: - gradle-check - gradle-check-windows + - pkl-cli-macOS-aarch64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-snapshot @@ -868,6 +841,12 @@ workflows: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ + - pkl-cli-macOS-aarch64-snapshot: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ - bench: filters: branches: @@ -920,6 +899,7 @@ workflows: requires: - gradle-check - gradle-check-windows + - pkl-cli-macOS-aarch64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-release @@ -957,6 +937,7 @@ workflows: jobs: - gradle-check - gradle-check-windows + - pkl-cli-macOS-aarch64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-release diff --git a/.circleci/jobs/BuildNativeJob.pkl b/.circleci/jobs/BuildNativeJob.pkl index a0eb72f4b..871fe6843 100644 --- a/.circleci/jobs/BuildNativeJob.pkl +++ b/.circleci/jobs/BuildNativeJob.pkl @@ -88,32 +88,20 @@ local setupLinuxEnvironment: Config.RunStep = } local setupMacEnvironment: Config.RunStep = - let (muslVersion = "1.2.2") - let (zlibVersion = "1.2.13") - new { - name = "Set up environment" - shell = "#!/bin/bash -exo pipefail" - command = new Listing { - #""" - # install jdk - curl -Lf \ - https://github.com/adoptium/temurin\#(module.majorJdkVersion)-binaries/releases/download/\#(module.jdkGitHubReleaseName)/OpenJDK\#(module.majorJdkVersion)U-jdk_\#(if (arch == "amd64") "x64" else "aarch64")_mac_hotspot_\#(module.jdkVersionAlt).tar.gz -o /tmp/jdk.tar.gz - - mkdir $HOME/jdk \ - && cd $HOME/jdk \ - && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . - - export JAVA_ROOT="/Library/Java/JavaVirtualMachines/jdk-\#(module.majorJdkVersion).jdk" - export JAVA_HOME="$JAVA_ROOT/Contents/Home" - export PATH="$JAVA_HOME/bin:$PATH" - mv $HOME/jdk $JAVA_ROOT - /usr/libexec/java_home -V - java -version - mkdir -p $HOME/.gradle - echo "org.gradle.java.home=$JAVA_HOME" >> $HOME/.gradle/gradle.properties - """# - }.join("\n\n") - } + new { + name = "Set up environment" + shell = "#!/bin/bash -exo pipefail" + command = + #""" + # install jdk + curl -Lf \ + https://github.com/adoptium/temurin\#(module.majorJdkVersion)-binaries/releases/download/\#(module.jdkGitHubReleaseName)/OpenJDK\#(module.majorJdkVersion)U-jdk_\#(if (arch == "amd64") "x64" else "aarch64")_mac_hotspot_\#(module.jdkVersionAlt).tar.gz -o /tmp/jdk.tar.gz + + mkdir $HOME/jdk \ + && cd $HOME/jdk \ + && cat /tmp/jdk.tar.gz | tar --strip-components=1 -xzC . + """# + } steps { when (os == "linux") { @@ -171,6 +159,9 @@ job { xcode = "15.3.0" } resource_class = "macos.m1.large.gen1" + environment { + ["JAVA_HOME"] = "~/jdk/Contents/Home" + } } when (os == "linux") { docker = new Listing { From 516ec72dade93f42cafb637a66b15121233b53f2 Mon Sep 17 00:00:00 2001 From: Dan Chao Date: Mon, 3 Feb 2025 20:32:35 -0800 Subject: [PATCH 4/7] Test all native builds too --- .circleci/config.pkl | 4 +- .circleci/config.yml | 91 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/.circleci/config.pkl b/.circleci/config.pkl index 89621e60b..7228f454d 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -22,7 +22,9 @@ import "jobs/DeployJob.pkl" import "jobs/SimpleGradleJob.pkl" local prbJobs: Listing = (gradleCheckJobs.keys.toListing()) { - "pkl-cli-macOS-aarch64-snapshot" + "bench" + "gradle-compatibility" + ...buildNativeJobs.keys.filter((it) -> it.endsWith("snapshot")) } local buildAndTestJobs = (prbJobs) { diff --git a/.circleci/config.yml b/.circleci/config.yml index e2cc1a08e..a6f7dc6fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -784,9 +784,30 @@ workflows: - gradle-check-windows: requires: - hold + - bench: + requires: + - hold + - gradle-compatibility: + requires: + - hold + - pkl-cli-macOS-amd64-snapshot: + requires: + - hold + - pkl-cli-linux-amd64-snapshot: + requires: + - hold - pkl-cli-macOS-aarch64-snapshot: requires: - hold + - pkl-cli-linux-aarch64-snapshot: + requires: + - hold + - pkl-cli-linux-alpine-amd64-snapshot: + requires: + - hold + - pkl-cli-windows-amd64-snapshot: + requires: + - hold when: matches: value: << pipeline.git.branch >> @@ -795,7 +816,14 @@ workflows: jobs: - gradle-check - gradle-check-windows + - bench + - gradle-compatibility + - pkl-cli-macOS-amd64-snapshot + - pkl-cli-linux-amd64-snapshot - pkl-cli-macOS-aarch64-snapshot + - pkl-cli-linux-aarch64-snapshot + - pkl-cli-linux-alpine-amd64-snapshot + - pkl-cli-windows-amd64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-snapshot @@ -808,7 +836,14 @@ workflows: requires: - gradle-check - gradle-check-windows + - bench + - gradle-compatibility + - pkl-cli-macOS-amd64-snapshot + - pkl-cli-linux-amd64-snapshot - pkl-cli-macOS-aarch64-snapshot + - pkl-cli-linux-aarch64-snapshot + - pkl-cli-linux-alpine-amd64-snapshot + - pkl-cli-windows-amd64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-snapshot @@ -841,12 +876,54 @@ workflows: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ + - bench: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ + - gradle-compatibility: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ + - pkl-cli-macOS-amd64-snapshot: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ + - pkl-cli-linux-amd64-snapshot: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ - pkl-cli-macOS-aarch64-snapshot: filters: branches: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ + - pkl-cli-linux-aarch64-snapshot: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ + - pkl-cli-linux-alpine-amd64-snapshot: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ + - pkl-cli-windows-amd64-snapshot: + filters: + branches: + ignore: /.*/ + tags: + only: /^v?\d+\.\d+\.\d+$/ - bench: filters: branches: @@ -899,7 +976,14 @@ workflows: requires: - gradle-check - gradle-check-windows + - bench + - gradle-compatibility + - pkl-cli-macOS-amd64-snapshot + - pkl-cli-linux-amd64-snapshot - pkl-cli-macOS-aarch64-snapshot + - pkl-cli-linux-aarch64-snapshot + - pkl-cli-linux-alpine-amd64-snapshot + - pkl-cli-windows-amd64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-release @@ -937,7 +1021,14 @@ workflows: jobs: - gradle-check - gradle-check-windows + - bench + - gradle-compatibility + - pkl-cli-macOS-amd64-snapshot + - pkl-cli-linux-amd64-snapshot - pkl-cli-macOS-aarch64-snapshot + - pkl-cli-linux-aarch64-snapshot + - pkl-cli-linux-alpine-amd64-snapshot + - pkl-cli-windows-amd64-snapshot - bench - gradle-compatibility - pkl-cli-macOS-amd64-release From 331b8984557e09d9b14b03d2f9efa2444fc57bff Mon Sep 17 00:00:00 2001 From: Dan Chao Date: Mon, 3 Feb 2025 20:36:27 -0800 Subject: [PATCH 5/7] Set JAVA_HOME --- .circleci/config.yml | 8 ++++---- .circleci/jobs/BuildNativeJob.pkl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6f7dc6fb..da0a7f96f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 - JAVA_HOME: ~/jdk/Contents/Home + JAVA_HOME: /Users/distiller/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -141,7 +141,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 - JAVA_HOME: ~/jdk/Contents/Home + JAVA_HOME: /Users/distiller/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -346,7 +346,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 - JAVA_HOME: ~/jdk/Contents/Home + JAVA_HOME: /Users/distiller/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 @@ -454,7 +454,7 @@ jobs: path: ~/test-results environment: LANG: en_US.UTF-8 - JAVA_HOME: ~/jdk/Contents/Home + JAVA_HOME: /Users/distiller/jdk/Contents/Home resource_class: macos.m1.large.gen1 macos: xcode: 15.3.0 diff --git a/.circleci/jobs/BuildNativeJob.pkl b/.circleci/jobs/BuildNativeJob.pkl index 871fe6843..5379c7081 100644 --- a/.circleci/jobs/BuildNativeJob.pkl +++ b/.circleci/jobs/BuildNativeJob.pkl @@ -160,7 +160,7 @@ job { } resource_class = "macos.m1.large.gen1" environment { - ["JAVA_HOME"] = "~/jdk/Contents/Home" + ["JAVA_HOME"] = "/Users/distiller/jdk/Contents/Home" } } when (os == "linux") { From 30b152a57f9ab5d8bc46abf8e165eb1b1c3e037a Mon Sep 17 00:00:00 2001 From: Dan Chao Date: Mon, 3 Feb 2025 20:37:42 -0800 Subject: [PATCH 6/7] temp set prb jobs --- .circleci/config.pkl | 12 +++---- .circleci/config.yml | 80 -------------------------------------------- 2 files changed, 6 insertions(+), 86 deletions(-) diff --git a/.circleci/config.pkl b/.circleci/config.pkl index 7228f454d..28bde1fcd 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -28,15 +28,15 @@ local prbJobs: Listing = (gradleCheckJobs.keys.toListing()) { } local buildAndTestJobs = (prbJobs) { - "bench" - "gradle-compatibility" - ...buildNativeJobs.keys.filter((it) -> it.endsWith("snapshot")) +// "bench" +// "gradle-compatibility" +// ...buildNativeJobs.keys.filter((it) -> it.endsWith("snapshot")) } local releaseJobs = (prbJobs) { - "bench" - "gradle-compatibility" - ...buildNativeJobs.keys.filter((it) -> it.endsWith("release")) +// "bench" +// "gradle-compatibility" +// ...buildNativeJobs.keys.filter((it) -> it.endsWith("release")) } prb { diff --git a/.circleci/config.yml b/.circleci/config.yml index da0a7f96f..e7a35c512 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -824,14 +824,6 @@ workflows: - pkl-cli-linux-aarch64-snapshot - pkl-cli-linux-alpine-amd64-snapshot - pkl-cli-windows-amd64-snapshot - - bench - - gradle-compatibility - - pkl-cli-macOS-amd64-snapshot - - pkl-cli-linux-amd64-snapshot - - pkl-cli-macOS-aarch64-snapshot - - pkl-cli-linux-aarch64-snapshot - - pkl-cli-linux-alpine-amd64-snapshot - - pkl-cli-windows-amd64-snapshot - deploy-snapshot: requires: - gradle-check @@ -844,14 +836,6 @@ workflows: - pkl-cli-linux-aarch64-snapshot - pkl-cli-linux-alpine-amd64-snapshot - pkl-cli-windows-amd64-snapshot - - bench - - gradle-compatibility - - pkl-cli-macOS-amd64-snapshot - - pkl-cli-linux-amd64-snapshot - - pkl-cli-macOS-aarch64-snapshot - - pkl-cli-linux-aarch64-snapshot - - pkl-cli-linux-alpine-amd64-snapshot - - pkl-cli-windows-amd64-snapshot context: pkl-maven-release - trigger-docsite-build: requires: @@ -924,54 +908,6 @@ workflows: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - bench: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - gradle-compatibility: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-macOS-amd64-release: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-linux-amd64-release: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-macOS-aarch64-release: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-linux-aarch64-release: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-linux-alpine-amd64-release: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-windows-amd64-release: - filters: - branches: - ignore: /.*/ - tags: - only: /^v?\d+\.\d+\.\d+$/ - github-release: requires: - gradle-check @@ -984,14 +920,6 @@ workflows: - pkl-cli-linux-aarch64-snapshot - pkl-cli-linux-alpine-amd64-snapshot - pkl-cli-windows-amd64-snapshot - - bench - - gradle-compatibility - - pkl-cli-macOS-amd64-release - - pkl-cli-linux-amd64-release - - pkl-cli-macOS-aarch64-release - - pkl-cli-linux-aarch64-release - - pkl-cli-linux-alpine-amd64-release - - pkl-cli-windows-amd64-release context: pkl-github-release filters: branches: @@ -1029,14 +957,6 @@ workflows: - pkl-cli-linux-aarch64-snapshot - pkl-cli-linux-alpine-amd64-snapshot - pkl-cli-windows-amd64-snapshot - - bench - - gradle-compatibility - - pkl-cli-macOS-amd64-release - - pkl-cli-linux-amd64-release - - pkl-cli-macOS-aarch64-release - - pkl-cli-linux-aarch64-release - - pkl-cli-linux-alpine-amd64-release - - pkl-cli-windows-amd64-release when: matches: value: << pipeline.git.branch >> From 5561850355b233377d9e535d5cbbebc74112810e Mon Sep 17 00:00:00 2001 From: Dan Chao Date: Mon, 3 Feb 2025 21:20:38 -0800 Subject: [PATCH 7/7] Restore PRB --- .circleci/config.pkl | 16 +++++------- .circleci/config.yml | 60 +++++++++++++------------------------------- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/.circleci/config.pkl b/.circleci/config.pkl index 28bde1fcd..ebe9ae1c5 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -21,22 +21,18 @@ import "jobs/GradleCheckJob.pkl" import "jobs/DeployJob.pkl" import "jobs/SimpleGradleJob.pkl" -local prbJobs: Listing = (gradleCheckJobs.keys.toListing()) { +local prbJobs: Listing = gradleCheckJobs.keys.toListing() + +local buildAndTestJobs = (prbJobs) { "bench" "gradle-compatibility" ...buildNativeJobs.keys.filter((it) -> it.endsWith("snapshot")) } -local buildAndTestJobs = (prbJobs) { -// "bench" -// "gradle-compatibility" -// ...buildNativeJobs.keys.filter((it) -> it.endsWith("snapshot")) -} - local releaseJobs = (prbJobs) { -// "bench" -// "gradle-compatibility" -// ...buildNativeJobs.keys.filter((it) -> it.endsWith("release")) + "bench" + "gradle-compatibility" + ...buildNativeJobs.keys.filter((it) -> it.endsWith("release")) } prb { diff --git a/.circleci/config.yml b/.circleci/config.yml index e7a35c512..efb7169d3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -784,30 +784,6 @@ workflows: - gradle-check-windows: requires: - hold - - bench: - requires: - - hold - - gradle-compatibility: - requires: - - hold - - pkl-cli-macOS-amd64-snapshot: - requires: - - hold - - pkl-cli-linux-amd64-snapshot: - requires: - - hold - - pkl-cli-macOS-aarch64-snapshot: - requires: - - hold - - pkl-cli-linux-aarch64-snapshot: - requires: - - hold - - pkl-cli-linux-alpine-amd64-snapshot: - requires: - - hold - - pkl-cli-windows-amd64-snapshot: - requires: - - hold when: matches: value: << pipeline.git.branch >> @@ -872,37 +848,37 @@ workflows: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-macOS-amd64-snapshot: + - pkl-cli-macOS-amd64-release: filters: branches: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-linux-amd64-snapshot: + - pkl-cli-linux-amd64-release: filters: branches: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-macOS-aarch64-snapshot: + - pkl-cli-macOS-aarch64-release: filters: branches: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-linux-aarch64-snapshot: + - pkl-cli-linux-aarch64-release: filters: branches: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-linux-alpine-amd64-snapshot: + - pkl-cli-linux-alpine-amd64-release: filters: branches: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ - - pkl-cli-windows-amd64-snapshot: + - pkl-cli-windows-amd64-release: filters: branches: ignore: /.*/ @@ -914,12 +890,12 @@ workflows: - gradle-check-windows - bench - gradle-compatibility - - pkl-cli-macOS-amd64-snapshot - - pkl-cli-linux-amd64-snapshot - - pkl-cli-macOS-aarch64-snapshot - - pkl-cli-linux-aarch64-snapshot - - pkl-cli-linux-alpine-amd64-snapshot - - pkl-cli-windows-amd64-snapshot + - pkl-cli-macOS-amd64-release + - pkl-cli-linux-amd64-release + - pkl-cli-macOS-aarch64-release + - pkl-cli-linux-aarch64-release + - pkl-cli-linux-alpine-amd64-release + - pkl-cli-windows-amd64-release context: pkl-github-release filters: branches: @@ -951,12 +927,12 @@ workflows: - gradle-check-windows - bench - gradle-compatibility - - pkl-cli-macOS-amd64-snapshot - - pkl-cli-linux-amd64-snapshot - - pkl-cli-macOS-aarch64-snapshot - - pkl-cli-linux-aarch64-snapshot - - pkl-cli-linux-alpine-amd64-snapshot - - pkl-cli-windows-amd64-snapshot + - pkl-cli-macOS-amd64-release + - pkl-cli-linux-amd64-release + - pkl-cli-macOS-aarch64-release + - pkl-cli-linux-aarch64-release + - pkl-cli-linux-alpine-amd64-release + - pkl-cli-windows-amd64-release when: matches: value: << pipeline.git.branch >>