From: Miod Vallat Date: Thu, 31 Jul 2025 09:40:58 +0000 (+0200) Subject: Drop 4.7, enter 5.0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15952%2Fhead;p=thirdparty%2Fpdns.git Drop 4.7, enter 5.0 Signed-off-by: Miod Vallat --- diff --git a/.github/workflows/build-and-test-all-releases-dispatch.yml b/.github/workflows/build-and-test-all-releases-dispatch.yml index ea2ef3a9d..2e598c74c 100644 --- a/.github/workflows/build-and-test-all-releases-dispatch.yml +++ b/.github/workflows/build-and-test-all-releases-dispatch.yml @@ -18,6 +18,12 @@ jobs: branch-name: master runner-docker-image-name: base-pdns-ci-image/debian-11-pdns-base + call-build-and-test-all-auth-50: + if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} + uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/auth-5.0.x + with: + branch-name: rel/auth-5.0.x + call-build-and-test-all-auth-49: if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/auth-4.9.x @@ -30,12 +36,6 @@ jobs: with: branch-name: rel/auth-4.8.x - call-build-and-test-all-auth-47: - if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} - uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/auth-4.7.x - with: - branch-name: rel/auth-4.7.x - call-build-and-test-all-rec-52: if: ${{ vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }} uses: PowerDNS/pdns/.github/workflows/build-and-test-all.yml@rel/rec-5.2.x diff --git a/.github/workflows/builder-releases-dispatch.yml b/.github/workflows/builder-releases-dispatch.yml index 54b057e0e..2ec21c8a4 100644 --- a/.github/workflows/builder-releases-dispatch.yml +++ b/.github/workflows/builder-releases-dispatch.yml @@ -11,6 +11,12 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo contents: read jobs: + call-builder-auth-50: + if: ${{ vars.SCHEDULED_JOBS_BUILDER }} + uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/auth-5.0.x + with: + branch-name: rel/auth-5.0.x + call-builder-auth-49: if: ${{ vars.SCHEDULED_JOBS_BUILDER }} uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/auth-4.9.x @@ -23,12 +29,6 @@ jobs: with: branch-name: rel/auth-4.8.x - call-builder-auth-47: - if: ${{ vars.SCHEDULED_JOBS_BUILDER }} - uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/auth-4.7.x - with: - branch-name: rel/auth-4.7.x - call-builder-rec-52: if: ${{ vars.SCHEDULED_JOBS_BUILDER }} uses: PowerDNS/pdns/.github/workflows/builder.yml@rel/rec-5.2.x diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py index 1cf044142..a2adbea06 100755 --- a/build-scripts/docker/repo-test/generate-repo-files.py +++ b/build-scripts/docker/repo-test/generate-repo-files.py @@ -44,7 +44,7 @@ def init_argparser(): 'test PowerDNS repositories.') parser.add_argument('release', metavar='RELEASE', choices=[# Authoritative Server - 'auth-47', 'auth-48', 'auth-49', 'auth-50', + 'auth-48', 'auth-49', 'auth-50', 'auth-master', # Recursor 'rec-48', 'rec-49', 'rec-50', 'rec-51', 'rec-52', 'rec-53', @@ -136,7 +136,7 @@ def write_release_files (release): if g_verbose: print("Writing release files...") - if release in ['auth-47', 'auth-48', 'auth-49', 'auth-50', 'auth-master', + if release in ['auth-48', 'auth-49', 'auth-50', 'auth-master', 'rec-48', 'rec-49', 'rec-50', 'rec-51', 'rec-52', 'rec-53', 'rec-master', 'dnsdist-17', 'dnsdist-18', 'dnsdist-19', 'dnsdist-20', 'dnsdist-master']: write_pkg_pin_file(release)