From: romeroalx <alexis.romero@open-xchange.com>
Date: Wed, 30 Apr 2025 06:58:32 +0000 (+0200)
Subject: auth-4.7.x: move to ubuntu 20 for package building and ci
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49a1361d4377b22382206224c802fd660cd6a514;p=thirdparty%2Fpdns.git

auth-4.7.x: move to ubuntu 20 for package building and ci
---

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index eeeec1d92e..9ebae49b8d 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -20,7 +20,7 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
 jobs:
   build-auth:
     name: build auth
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
@@ -62,7 +62,7 @@ jobs:
 
   test-auth-api:
     needs: build-auth
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
@@ -114,7 +114,7 @@ jobs:
 
   test-auth-backend:
     needs: build-auth
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
@@ -227,7 +227,7 @@ jobs:
 
   test-ixfrdist:
     needs: build-auth
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
@@ -250,7 +250,7 @@ jobs:
       - run: inv test-ixfrdist
 
   swagger-syntax-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v4
diff --git a/.github/workflows/builder-dispatch.yml b/.github/workflows/builder-dispatch.yml
index fdeca1af10..5ace370e04 100644
--- a/.github/workflows/builder-dispatch.yml
+++ b/.github/workflows/builder-dispatch.yml
@@ -19,8 +19,8 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
 jobs:
   build:
     name: build ${{ github.event.inputs.product }} for ${{ github.event.inputs.os }}
-    # on a ubuntu-20.04 VM
-    runs-on: ubuntu-20.04
+    # on a ubuntu-22.04 VM
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 36a58af13a..8bf48dae1a 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -18,8 +18,8 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
 jobs:
   build:
     name: build.sh
-    # on a ubuntu-20.04 VM
-    runs-on: ubuntu-20.04
+    # on a ubuntu-22.04 VM
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         product: ['authoritative']
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e817c04ff9..29ea8e678a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -12,7 +12,7 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     permissions:
       actions: read # for github/codeql-action/init to get workflow details
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index cedeef1269..5269e96e6b 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -11,8 +11,8 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
 jobs:
   build:
     name: verify formatting and Makefile.am sort order
-    # on a ubuntu-20.04 VM
-    runs-on: ubuntu-20.04
+    # on a ubuntu-22.04 VM
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -21,12 +21,7 @@ jobs:
       - name: Update dependencies
         run: |
           sudo apt-get update
-          sudo apt-get -qq --no-install-recommends install git clang-11
-      - name: Run format-code on files that should be formatted
-        run: |
-           ./build-scripts/format-code $(find . -type f -name '*.[ch][ch]' | sort | comm -23 - .not-formatted)
-           git --no-pager diff
-           exit $(git diff | wc -l)
+          sudo apt-get -qq --no-install-recommends install git
       - name: Report file names that are out of order in Makefile.am files
         run: |
            exitcode=0
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index fc3317e540..605f99a52c 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -6,7 +6,7 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
 
 jobs:
   Fuzzing:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Build Fuzzers
       uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master