diff --git a/.circleci/config.pkl b/.circleci/config.pkl index 345ff02c..c1b9cc28 100644 --- a/.circleci/config.pkl +++ b/.circleci/config.pkl @@ -14,7 +14,7 @@ // limitations under the License. //===----------------------------------------------------------------------===// // File gets rendered to .circleci/config.yml via git hook. -amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.0.2#/PklCI.pkl" +amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.1.0#/PklCI.pkl" import "jobs/BuildNativeJob.pkl" import "jobs/GradleCheckJob.pkl" @@ -73,6 +73,10 @@ release { } } +releaseBranch { + jobs = releaseJobs +} + triggerDocsBuild = "both" triggerPackageDocsBuild = "release" diff --git a/.circleci/config.yml b/.circleci/config.yml index b746b66c..9d866677 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -887,3 +887,18 @@ workflows: ignore: /.*/ tags: only: /^v?\d+\.\d+\.\d+$/ + release-branch: + jobs: + - gradle-check-jdk11 + - gradle-check-jdk17 + - check-patch-file + - bench + - 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 + when: + matches: + value: << pipeline.git.branch >> + pattern: ^release/\d+\.\d+$ diff --git a/.circleci/jobs/BuildNativeJob.pkl b/.circleci/jobs/BuildNativeJob.pkl index c110367d..52f38f7e 100644 --- a/.circleci/jobs/BuildNativeJob.pkl +++ b/.circleci/jobs/BuildNativeJob.pkl @@ -16,7 +16,7 @@ /// Builds the native `pkl` CLI extends "GradleJob.pkl" -import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.0.0#/Config.pkl" +import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.0#/Config.pkl" import "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.uri@1.0.0#/URI.pkl" /// The OS to run on diff --git a/.circleci/jobs/DeployJob.pkl b/.circleci/jobs/DeployJob.pkl index a8281d6f..c8192cef 100644 --- a/.circleci/jobs/DeployJob.pkl +++ b/.circleci/jobs/DeployJob.pkl @@ -15,7 +15,7 @@ //===----------------------------------------------------------------------===// extends "GradleJob.pkl" -import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.0.0#/Config.pkl" +import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.0#/Config.pkl" local self = this diff --git a/.circleci/jobs/GradleCheckJob.pkl b/.circleci/jobs/GradleCheckJob.pkl index 85ba8498..cf9b70b3 100644 --- a/.circleci/jobs/GradleCheckJob.pkl +++ b/.circleci/jobs/GradleCheckJob.pkl @@ -15,7 +15,7 @@ //===----------------------------------------------------------------------===// extends "GradleJob.pkl" -import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.0.0#/Config.pkl" +import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.0#/Config.pkl" javaVersion: "11.0"|"17.0" diff --git a/.circleci/jobs/GradleJob.pkl b/.circleci/jobs/GradleJob.pkl index eed5dc6f..298093c9 100644 --- a/.circleci/jobs/GradleJob.pkl +++ b/.circleci/jobs/GradleJob.pkl @@ -15,7 +15,7 @@ //===----------------------------------------------------------------------===// abstract module GradleJob -import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.0.0#/Config.pkl" +import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.0#/Config.pkl" /// Whether this is a release build or not. isRelease: Boolean = false diff --git a/.circleci/jobs/SimpleGradleJob.pkl b/.circleci/jobs/SimpleGradleJob.pkl index 9f925361..04302c3e 100644 --- a/.circleci/jobs/SimpleGradleJob.pkl +++ b/.circleci/jobs/SimpleGradleJob.pkl @@ -15,7 +15,7 @@ //===----------------------------------------------------------------------===// extends "GradleJob.pkl" -import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.0.0#/Config.pkl" +import "package://pkg.pkl-lang.org/pkl-pantry/com.circleci.v2@1.1.0#/Config.pkl" name: String = command