diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 7ba3aff93..4e7ff7f05 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -54,7 +54,7 @@ jobs: - name: Upload deb file to Artifactory if: steps.check-deb.outputs.file_exists == 'false' run: | - debVersionList=("bookworm" "bullseye" "buster" "jammy" "focal" "bionic") + debVersionList=("trixie" "bookworm" "bullseye" "buster" "noble" "jammy" "focal" "bionic") for debVersion in "${debVersionList[@]}"; do distroList+="deb.distribution=${debVersion};" done diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle index 4b0561706..2a856a076 100644 --- a/linux/ca-certificates/debian/build.gradle +++ b/linux/ca-certificates/debian/build.gradle @@ -25,9 +25,11 @@ version "1.0.0-SNAPSHOT" * **Attention**: If you alter the list, check if the class DebianFlavours needs to be updated, too. */ def deb_versions = [ + "trixie", // Debian/13 "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) "bionic", // Ubuntu/18.04 (LTS) diff --git a/linux/ca-certificates/debian/src/main/packaging/debian/changelog b/linux/ca-certificates/debian/src/main/packaging/debian/changelog index 5295b6846..c6bf0fa9e 100644 --- a/linux/ca-certificates/debian/src/main/packaging/debian/changelog +++ b/linux/ca-certificates/debian/src/main/packaging/debian/changelog @@ -1,3 +1,9 @@ +adoptium-ca-certificates (1.0.3-1) STABLE; urgency=medium + + * Add Debian Trixie & Ubuntu Noble to the list of supported releases. + + -- Eclipse Adoptium Package Maintainers Thu, 25 April 2024 10:30:30 +0000 + adoptium-ca-certificates (1.0.2-1) STABLE; urgency=medium * Add Debian Bookworm to the list of supported releases. diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java index 266697cda..06a4bf87d 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java @@ -60,7 +60,7 @@ void packageSuccessfullyInstalled(String distribution, String codename) { assertThat(result.getExitCode()).isEqualTo(0); assertThat(result.getStdout()) .contains("Package: adoptium-ca-certificates") - .contains("Version: 1.0.2-1") + .contains("Version: 1.0.3-1") .contains("Priority: optional") .contains("Architecture: all") .contains("Status: install ok installed"); diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java index 12c47ada3..817837235 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java @@ -32,9 +32,11 @@ class ChangesVerificationTest { private static String[] versionsList = { + "trixie", // Debian/13 "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) "bionic", // Ubuntu/18.04 (LTS) diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java index 29c0f9cc1..46cfcb984 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java @@ -35,9 +35,11 @@ public Stream provideArguments(ExtensionContext context) { * (https://wiki.ubuntu.com/Releases) */ 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) diff --git a/linux/jdk/debian/src/main/packaging/build.sh b/linux/jdk/debian/src/main/packaging/build.sh index 18eaf6d70..4f32c1b46 100644 --- a/linux/jdk/debian/src/main/packaging/build.sh +++ b/linux/jdk/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/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java index c96118e66..25ff17cd7 100644 --- a/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -36,9 +36,11 @@ public Stream provideArguments(ExtensionContext context) { * (https://wiki.ubuntu.com/Releases) */ 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)