Merge branch 'master' into upd_installer_docs

adoptium · May 23, 2024 · b512359 · b512359
2 parents 3ba34f6 + f0619f6
commit b512359
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
         with:
           disable-sudo: true
           egress-policy: block

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           sarif_file: results.sarif
diff --git a/linux/jre/debian/src/main/packaging/build.sh b/linux/jre/debian/src/main/packaging/build.sh
@@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then
 fi
 
 # $ and $ARCH are env variables passing in from "docker run"
-debVersionList="bookworm bullseye buster jammy focal bionic"
+debVersionList="trixie bookworm bullseye buster noble jammy focal bionic"
 
 # the target package is only based on the host machine's ARCH
 # ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent

diff --git a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java
@@ -35,13 +35,15 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		 * Ubuntu policy: Current LTS versions, and development version.
 		 *     (https://wiki.ubuntu.com/Releases)
 		 */
-		return Stream.of(
-				Arguments.of("debian", "bookworm"), // Debian/12 (testing)
-				Arguments.of("debian", "bullseye"), // Debian/11 (stable)
-				Arguments.of("debian", "buster"),   // Debian/10 (oldstable)
-				Arguments.of("ubuntu", "jammy"),    // Ubuntu/22.04 (LTS)
-				Arguments.of("ubuntu", "focal"),    // Ubuntu/20.04 (LTS)
-				Arguments.of("ubuntu", "bionic")    // Ubuntu/18.04 (LTS)
-		);
+		 return Stream.of(
+        	        	Arguments.of("debian", "trixie"),   // Debian/13 (testing)
+                		Arguments.of("debian", "bookworm"), // Debian/12 (testing)
+                		Arguments.of("debian", "bullseye"), // Debian/11 (stable)
+                		Arguments.of("debian", "buster"),   // Debian/10 (oldstable)
+                		Arguments.of("ubuntu", "noble"),    // Ubuntu/24.04 (LTS)
+                		Arguments.of("ubuntu", "jammy"),    // Ubuntu/22.04 (LTS)
+                		Arguments.of("ubuntu", "focal"),    // Ubuntu/20.04 (LTS)
+                		Arguments.of("ubuntu", "bionic")    // Ubuntu/18.04 (LTS)
+        	);
 	}
 }