From 34d7152cb17776ff3ab9b403a69b4a287fea21e7 Mon Sep 17 00:00:00 2001 From: sophia-guo Date: Tue, 19 Mar 2024 01:20:46 -0400 Subject: [PATCH 1/3] Refer reprodicible tooling to new folder (#975) Reproducible tooling has been reorganized. Signed-off-by: Sophia Guo --- tools/reproduce_comparison/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/reproduce_comparison/Jenkinsfile b/tools/reproduce_comparison/Jenkinsfile index 2c27929c7..c79535852 100644 --- a/tools/reproduce_comparison/Jenkinsfile +++ b/tools/reproduce_comparison/Jenkinsfile @@ -158,7 +158,7 @@ pipeline { sh "find . -type f -name 'OpenJDK*-jdk*.tar.gz' -delete" } try { - dir('temurin-build/tooling') { + dir('temurin-build/tooling/reproducible') { def rc = 0 if (COMPARED_JOB_NAME.contains('linux')) { rc = sh returnStatus: true, script: "./repro_compare.sh temurin ${WORKSPACE}/original temurin ${WORKSPACE}/reproduced Linux" From 00cdcdf4cdab49d4e3b858fc71242450f2d18421 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Tue, 19 Mar 2024 09:30:15 +0000 Subject: [PATCH 2/3] Add JDK22 support to Master branch. (#976) * Create jdk22_release.groovy * Add RISCV * Add JDK22 --- .../release_pipeline_generator.groovy | 2 +- pipelines/jobs/configurations/jdk22.groovy | 3 ++ .../jobs/configurations/jdk22_release.groovy | 37 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pipelines/jobs/configurations/jdk22_release.groovy diff --git a/pipelines/build/regeneration/release_pipeline_generator.groovy b/pipelines/build/regeneration/release_pipeline_generator.groovy index 9b6cadd88..6b5bc7aac 100644 --- a/pipelines/build/regeneration/release_pipeline_generator.groovy +++ b/pipelines/build/regeneration/release_pipeline_generator.groovy @@ -7,7 +7,7 @@ file used as jenkinsfile to generator official release pipeline */ // ensure releaseVersions is updated before create releaseTag -def releaseVersions = [8,11,17,21] +def releaseVersions = [8,11,17,21,22] // Regenerate release-openjdkX-pipeline per each jdk version listed in releaseVersions diff --git a/pipelines/jobs/configurations/jdk22.groovy b/pipelines/jobs/configurations/jdk22.groovy index c20d763be..e4cbc054c 100644 --- a/pipelines/jobs/configurations/jdk22.groovy +++ b/pipelines/jobs/configurations/jdk22.groovy @@ -29,6 +29,9 @@ targetConfigurations = [ ], 'aarch64Mac': [ 'temurin' + ], + 'riscv64Linux': [ + 'temurin' ] ] diff --git a/pipelines/jobs/configurations/jdk22_release.groovy b/pipelines/jobs/configurations/jdk22_release.groovy new file mode 100644 index 000000000..a0130bbbf --- /dev/null +++ b/pipelines/jobs/configurations/jdk22_release.groovy @@ -0,0 +1,37 @@ +targetConfigurations = [ + 'x64Mac' : [ + 'temurin' + ], + 'x64Linux' : [ + 'temurin' + ], + 'x64AlpineLinux' : [ + 'temurin' + ], + 'aarch64AlpineLinux' : [ + 'temurin' + ], + 'x64Windows' : [ + 'temurin' + ], + 'ppc64Aix' : [ + 'temurin' + ], + 'ppc64leLinux': [ + 'temurin' + ], + 's390xLinux' : [ + 'temurin' + ], + 'aarch64Linux': [ + 'temurin' + ], + 'aarch64Mac': [ + 'temurin' + ], + 'riscv64Linux': [ + 'temurin' + ] +] + +return this From 4f9e1ea9b0f8906df7658cc88be9ee1366665601 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 19 Mar 2024 15:43:10 +0000 Subject: [PATCH 3/3] Remove master from code-freeze and fix release branch regex (#978) Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-freeze.yml b/.github/workflows/code-freeze.yml index bf3264da8..6f354c4ea 100644 --- a/.github/workflows/code-freeze.yml +++ b/.github/workflows/code-freeze.yml @@ -3,7 +3,7 @@ name: Code Freeze Bot # Controls when the workflow will run on: pull_request_target: - branches: [ "master", "v[0-9]{4}.[0-9]{2}.[0-9]{2}" ] + branches: [ "v[0-9]+.[0-9]+.[0-9]+" ] issue_comment: types: [created]