Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cacerts for debian 13 & ubuntu 24 #868

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Update cacerts for debian 13 & ubuntu 24 #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f85d8
Update cacerts for debian & ubuntu
steelhead31 Apr 25, 2024
dad27c1
Bump cacerts package version
steelhead31 Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cacert-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions linux/ca-certificates/debian/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions linux/ca-certificates/debian/src/main/packaging/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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.
Expand Down
2 changes: 1 addition & 1 deletion ...rtificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 2 additions & 0 deletions ...ates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions ...-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ public Stream<? extends Arguments> 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)
Expand Down
2 changes: 1 addition & 1 deletion linux/jdk/debian/src/main/packaging/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ public Stream<? extends Arguments> 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)
Expand Down
Loading