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

v7.3.6 #69

Merged
merged 5 commits into from
Dec 2, 2024
+23 −12
Merged

v7.3.6 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d083340
Experimenting...
ximon18 Dec 1, 2024
ef75875
Try to add Ubuntu Noble to testing
Koenvh1 Dec 2, 2024
6459c8e
Now actually include Noble in tests
Koenvh1 Dec 2, 2024
1695a75
Switch to libssl3 for Ubuntu Noble
Koenvh1 Dec 2, 2024
5af9271
Add timer service for Ubuntu Noble
Koenvh1 Dec 2, 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
28 changes: 16 additions & 12 deletions .github/workflows/pkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
jobs:
full:
if: ${{ inputs.single_job == '' || inputs.single_job == 'full' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: full_
Expand All @@ -43,6 +43,7 @@ jobs:
image:
- "ubuntu:bionic"
- "ubuntu:jammy" # ubuntu/22.04
- "ubuntu:noble" # ubuntu/24.04
- "debian:stretch"
- "debian:buster"
- "debian:bullseye"
Expand Down Expand Up @@ -88,6 +89,9 @@ jobs:
- image: "ubuntu:jammy"
deb_extra_lintian_args: "--suppress-tags no-manual-page,changelog-not-compressed-with-max-compression"

- image: "ubuntu:noble"
deb_extra_lintian_args: "--suppress-tags no-manual-page,changelog-not-compressed-with-max-compression"

- image: "debian:stretch"
deb_extra_lintian_args: "--suppress-tags binary-without-manpage,changelog-not-compressed-with-max-compression"

Expand Down Expand Up @@ -136,11 +140,11 @@ jobs:

minimal:
if: ${{ inputs.single_job == '' || inputs.single_job == 'minimal' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix

no_test_scripts:
if: ${{ inputs.single_job == '' || inputs.single_job == 'no_test_scripts' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: no_test_scripts_
Expand All @@ -167,7 +171,7 @@ jobs:

default_tests:
if: ${{ inputs.single_job == '' || inputs.single_job == 'default_tests' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: default_tests_
Expand All @@ -188,7 +192,7 @@ jobs:

default_tests_with_upgrades:
if: ${{ inputs.single_job == '' || inputs.single_job == 'default_tests_with_upgrades' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: default_tests_with_upgrades_
Expand Down Expand Up @@ -246,7 +250,7 @@ jobs:

no_tests:
if: ${{ inputs.single_job == '' || inputs.single_job == 'no_tests' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: no_tests_
Expand All @@ -273,7 +277,7 @@ jobs:

no_docker:
if: ${{ inputs.single_job == '' || inputs.single_job == 'no_docker' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
with:
artifact_prefix: no_docker_
cross_build_args: --no-default-features
Expand All @@ -296,7 +300,7 @@ jobs:

only_docker:
if: ${{ inputs.single_job == '' || inputs.single_job == 'only_docker' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: only_docker_
Expand Down Expand Up @@ -326,7 +330,7 @@ jobs:

docker_no_secrets:
if: ${{ inputs.single_job == '' || inputs.single_job == 'docker_no_secrets' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
with:
artifact_prefix: docker_no_secrets_

Expand All @@ -339,7 +343,7 @@ jobs:

no_cross:
if: ${{ inputs.single_job == '' || inputs.single_job == 'no_cross' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: no_cross_
Expand Down Expand Up @@ -384,7 +388,7 @@ jobs:

test_with_alt_pkg:
if: ${{ inputs.single_job == '' || inputs.single_job == 'test_with_alt_pkg' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: test_with_alt_pkg
Expand All @@ -410,7 +414,7 @@ jobs:

test_with_alt_cargo_toml:
if: ${{ inputs.single_job == '' || inputs.single_job == 'test_with_alt_cargo_toml' }}
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
secrets: inherit
with:
artifact_prefix: test_with_alt_cargo_toml
Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Define a workspace to ensure compatibility with workspaces:

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / test_with_alt_cargo_toml / pkg (app, ubuntu:jammy, x86_64) 

Cargo deb variant 'ubuntu-jammy' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / default_tests_with_upgrades / pkg (mytest, debian:buster, x86_64) 

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / no_docker / pkg (mytest, debian:bullseye, x86_64) 

Cargo deb variant 'debian-bullseye' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / no_docker / pkg (mytest, debian:buster, x86_64) 

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / full / pkg (debian:buster, x86_64) 

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / no_test_scripts / pkg (mytest, debian:bullseye, x86_64) 

Cargo deb variant 'debian-bullseye' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / default_tests / pkg (mytest, debian:buster, x86_64) 

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / default_tests / pkg (mytest, debian:bullseye, x86_64) 

Cargo deb variant 'debian-bullseye' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / full / pkg (debian:bullseye, x86_64) 

Cargo deb variant 'debian-bullseye' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / no_test_scripts / pkg (mytest, debian:buster, x86_64) 

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / no_tests / pkg (mytest, debian:buster, x86_64) 

Cargo deb variant 'debian-buster' not found, using defaults instead.

Check notice on line 1 in Cargo.toml

View workflow job for this annotation

GitHub Actions / no_tests / pkg (mytest, debian:bullseye, x86_64) 

Cargo deb variant 'debian-bullseye' not found, using defaults instead.
[workspace]
members = [
"adder"
Expand Down Expand Up @@ -52,6 +52,9 @@
[package.metadata.deb.variants.debian-bookworm]
depends = "$auto, passwd, libssl3"

[package.metadata.deb.variants.ubuntu-noble]
depends = "$auto, passwd, libssl3"

[package.metadata.deb.variants.minimal]
depends = "libc6 (>= 2.27), rsync" # a deliberately different dependency that we can test for on older O/S's.
maintainer = "Minimal Maintainer <[email protected]>"
Expand Down
1 change: 1 addition & 0 deletions pkg/common/mytest-ubuntu-noble.mytest.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mytest.mytest.service
1 change: 1 addition & 0 deletions pkg/common/mytest-ubuntu-noble.mytest.timer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mytest.mytest.timer
1 change: 1 addition & 0 deletions pkg/rules/package-build-rules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ pkg:
image:
- "ubuntu:bionic"
- "ubuntu:jammy" # ubuntu/22.04
- "ubuntu:noble"
- "debian:stretch"
- "debian:buster"
- "debian:bullseye"
Expand Down
1 change: 1 addition & 0 deletions pkg/rules/package-test-rules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pkg:
image:
- "ubuntu:bionic"
- "ubuntu:jammy" # ubuntu/22.04
- "ubuntu:noble"
- "debian:stretch" # should get excluded because the LXC image no longer exists
- "debian:buster"
- "debian:bullseye"
Expand Down
Loading