diff options
| author | Michael Biebl <biebl@debian.org> | 2026-02-22 00:39:58 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2026-02-22 00:39:58 +0100 |
| commit | 067fb576988f685e83ac8b0ae690334aff547c85 (patch) | |
| tree | 204c7c8a0300691c53627cd3418cf54671ada1a8 /.gitlab-ci | |
| parent | 6de29285e533f4fec22a219013f3687edb6b7399 (diff) | |
New upstream version 1.56.0 upstream/1.56.0
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/ci.template | 2 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 31 | ||||
| -rw-r--r-- | .gitlab-ci/distros-info.yml | 52 | ||||
| -rwxr-xr-x | .gitlab-ci/run-test.sh | 7 |
4 files changed, 62 insertions, 30 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 3af5cac4..4ef3ff9e 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -240,7 +240,7 @@ pages: rules: - if: $CI_PIPELINE_SOURCE == 'schedule' when: never - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main' + - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH dependencies: - "t_{{default_distro.name}}:{{default_distro.versions[0]}}: [meson+gcc+docs+valgrind]" needs: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index b99c1673..28d31931 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -23,17 +23,39 @@ distributions: - name: fedora tier: 1 versions: - - '43' + - '42' # TIER 2: distribution versions that will or might use the current NM version. # Run when doing a release. + - name: fedora + tier: 2 + versions: + - 'rawhide' + - name: centos + tier: 2 + versions: + - 'stream10' + - 'stream9' + - name: ubuntu + tier: 2 + versions: + - 'devel' + - name: debian + tier: 2 + versions: + - 'testing' + - 'sid' + - name: alpine + tier: 2 + versions: + - 'edge' # TIER 3: distribution versions not in EOL but don't use the current NM version. # Run when doing a release, but a failure won't be blocking for the release. - name: fedora tier: 3 versions: - - '42' + - '43' - '41' - name: ubuntu tier: 3 @@ -53,8 +75,3 @@ distributions: - '3.21' - '3.20' - '3.19' - - name: centos - tier: 3 - versions: - - 'stream10' - - 'stream9' diff --git a/.gitlab-ci/distros-info.yml b/.gitlab-ci/distros-info.yml index 90d23993..e2ac2829 100644 --- a/.gitlab-ci/distros-info.yml +++ b/.gitlab-ci/distros-info.yml @@ -8,6 +8,9 @@ fedora: - version: rawhide support: yes nm: main +- version: 43 + support: 2026-12-02 + nm: 1.54 - version: 42 support: 2026-05-13 nm: 1.52 @@ -18,8 +21,11 @@ fedora: # CentOS Stream centos: +- version: stream10 + support: 2030-12-31 # exact date unknown, only the year + nm: main - version: stream9 - support: 2027-05-31 + support: 2027-12-31 # exact date unknown, only the year nm: main # RHEL: @@ -31,33 +37,43 @@ centos: # support: 6 months # Releases and support info: https://access.redhat.com/support/policy/updates/errata rhel: -- version: 9.6 # not released yet +# Not released yet +- version: 10.1 support: yes - nm: main -- version: 9.5 + nm: 1.54 +- version: 9.7 # not released yet support: yes - nm: 1.48 + nm: 1.54 +# Full support or EUS support: +- version: 10.0 + support: 2027-05-31 + extended-support: 2029-05-31 + nm: 1.52 +- version: 9.6 + support: 2027-05-31 + extended-support: 2029-05-31 + nm: 1.52 - version: 9.4 support: 2026-04-30 extended-support: 2028-04-30 nm: 1.46 -- version: 9.2 - support: 2025-05-31 - extended-support: 2027-05-31 - nm: 1.42 - version: 8.10 # last RHEL 8 release, maintenaince support only support: 2029-05-31 extended-support: no nm: 1.40 -- version: 8.8 +# SAP / Enhaced EUS only: +- version: 9.2 support: 2025-05-31 extended-support: 2027-05-31 - nm: 1.40 -# SAP / Enhaced EUS only: + nm: 1.42 - version: 9.0 support: 2024-05-31 extended-support: 2026-05-31 nm: 1.36 +- version: 8.8 + support: 2025-05-31 + extended-support: 2027-05-31 + nm: 1.40 - version: 8.6 support: 2024-05-31 extended-support: 2026-05-31 @@ -81,10 +97,6 @@ ubuntu: name: plucky support: 2026-01-15 nm: 1.52 -- version: 24.10 - name: oracular - support: 2025-07-10 - nm: 1.48 - version: 24.04 name: noble support: 2029-05-31 @@ -109,6 +121,11 @@ debian: - version: sid support: yes nm: main +- version: 13 + name: trixie + support: 2028-08-09 + extended-support: 2030-06-30 + nm: 1.52 - version: 12 name: bookworm support: 2026-06-11 @@ -130,6 +147,9 @@ alpine: - version: edge support: yes nm: main +- version: 3.22 + support: 2027-05-01 + nm: 1.52 - version: 3.21 support: 2026-11-01 nm: 1.50 diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh index 44405558..b58a1c32 100755 --- a/.gitlab-ci/run-test.sh +++ b/.gitlab-ci/run-test.sh @@ -155,12 +155,7 @@ test_subtree() { do_clean pushd ./src/$d - ARGS=() - if [ "$d" = n-acd ]; then - ARGS+=('-Debpf=false') - fi - - CC="$cc" CFLAGS="-Werror -Wall" meson build "${ARGS[@]}" + CC="$cc" CFLAGS="-Werror -Wall" meson build ninja -v -C build test popd |