Merge remote-tracking branch 'origin/master' into devkit_job

adoptium · Mar 4, 2024 · 2786d81 · 2786d81
2 parents b7fa936 + 8991fc2
commit 2786d81
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/code-freeze.yml b/.github/workflows/code-freeze.yml
@@ -7,6 +7,10 @@ on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   codefreeze:
     uses: adoptium/.github/.github/workflows/code-freeze.yml@main

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -7,7 +7,11 @@ on:
   issue_comment:
 
 jobs:
-  Label:
+  label:
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
     runs-on: ubuntu-latest
     name: Assign Labels
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+    - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
         java-version: '11'
         distribution: 'temurin'

diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -183,7 +183,7 @@ class Config17 {
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [
-                        'hotspot'   : '--create-jre-image --create-sbom'
+                        'temurin'   : '--create-jre-image --create-sbom'
                 ]
         ],
 

diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -6,7 +6,8 @@ class Config22 {
                 arch                : 'x64',
                 additionalNodeLabels: 'xcode15.0.1',
                 additionalTestLabels: [
-                        openj9      : '!sw.os.osx.10_11'
+                        openj9      : '!sw.os.osx.10_11',
+                        temurin     : '!sw.os.osx.10_14'
                 ],
                 test                : 'default',
                 configureArgs       : '--enable-dtrace',

diff --git a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy
@@ -6,7 +6,8 @@ class Config23 {
                 arch                : 'x64',
                 additionalNodeLabels: 'xcode15.0.1',
                 additionalTestLabels: [
-                        openj9      : '!sw.os.osx.10_11'
+                        openj9      : '!sw.os.osx.10_11',
+                        temurin     : '!sw.os.osx.10_14'
                 ],
                 test                : 'default',
                 configureArgs       : '--enable-dtrace',

diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy
@@ -353,7 +353,7 @@ node('worker') {
               def latestOpenjdkBuild = getLatestOpenjdkBuildTag("jdk")
               def tipVersion = tipRelease.replaceAll("u", "").replaceAll("jdk", "").toInteger()
               def releaseName = getLatestBinariesTag("${tipVersion}")
-              status = [releaseName: releaseName, expectedReleaseName: "${latestOpenjdkBuild}-ea-beta"]
+              status = [releaseName: releaseName, expectedReleaseName: "${latestOpenjdkBuild}-ea-beta", upstreamTag: latestOpenjdkBuild]
               verifyReleaseContent(tipRelease, releaseName, variant, status)
               echo "  ${tipRelease} release binaries verification: "+status['assets']
               healthStatus[tipRelease] = status