Move clang-tidy-auth to build-and-test-all workflow

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 642e34c11e575093c484d65357d4a9ae823fa542..6ad18040e795bbc2ca365e3b27abae063d1ff4e9 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -40,10 +40,29 @@ jobs:
           restore-keys: auth-ccache-
       - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
       - run: inv install-clang
+      - run: inv install-clang-tidy-tools
       - run: inv install-auth-build-deps
       - run: inv ci-autoconf
       - run: inv ci-auth-configure
-      - run: inv ci-auth-make
+      - run: inv ci-auth-make-bear  # This runs under pdns/
+      - run: ln -s .clang-tidy.full .clang-tidy
+      - name: Run clang-tidy
+        working-directory: pdns
+        run: git diff -U0 HEAD^..HEAD | python3 /usr/bin/clang-tidy-diff-12.py -clang-tidy-binary /usr/bin/clang-tidy-12 -extra-arg=-ferror-limit=0 -p2 -export-fixes clang-tidy-auth.yml
+      - name: Print clang-tidy fixes YAML
+        working-directory: pdns
+        shell: bash
+        run: |
+          if [ -f clang-tidy-auth.yml ]; then
+            cat clang-tidy-auth.yml
+          fi
+      - name: Result annotations
+        shell: bash
+        working-directory: pdns
+        run: |
+          if [ -f clang-tidy-auth.yml ]; then
+            python3 ../.github/scripts/clang-tidy.py --fixes-file clang-tidy-auth.yml
+          fi
       - run: inv ci-auth-install-remotebackend-test-deps
       - run: inv ci-auth-run-unit-tests
       - run: inv ci-make-install

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 3e6ef3e68d0fc4ee55b872f39081a6d8a765b7c8..18f8ad9322663a64abbce8132373b98757235c92 100644 (file)
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -9,54 +9,6 @@ permissions:
   contents: read
 
 jobs:
-  clang-tidy-auth:
-    name: auth clang-tidy
-    runs-on: ubuntu-20.04
-    env:
-      UNIT_TESTS: yes
-      SANITIZERS:
-    steps:
-      - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - name: get timestamp for cache
-        id: get-stamp
-        shell: bash
-        run: |
-          echo "stamp=$(/bin/date +%s)" >> "$GITHUB_OUTPUT"
-      - name: let GitHub cache our ccache data
-        uses: actions/cache@v3
-        with:
-          path: ~/.ccache
-          key: auth-ccache-${{ steps.get-stamp.outputs.stamp }}
-          restore-keys: auth-ccache-
-      - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
-      - run: inv install-clang
-      - run: inv install-clang-tidy-tools
-      - run: inv install-auth-build-deps
-      - run: inv ci-autoconf
-      - run: inv ci-auth-configure
-      - run: inv ci-auth-make-bear
-      - run: ccache -s
-      - run: mkdir clang-tidy-results
-      - run: ln -s .clang-tidy.full .clang-tidy
-      - name: Run clang-tidy
-        working-directory: pdns
-        run: git diff -U0 HEAD^ | python /usr/bin/clang-tidy-diff-12.py -p2 -export-fixes ../clang-tidy-results/auth-fixes.yml
-      - name: Print clang-tidy fixes YAML
-        shell: bash
-        run: |
-          if [ -f clang-tidy-results/auth-fixes.yml ]; then
-            cat clang-tidy-results/auth-fixes.yml
-          fi
-      - name: Result annotations
-        shell: bash
-        run: |
-          if [ -f clang-tidy-results/auth-fixes.yml ]; then
-            python .github/scripts/clang-tidy.py --fixes-file clang-tidy-results/auth-fixes.yml
-          fi
-
   clang-tidy-rec:
     name: rec clang-tidy
     runs-on: ubuntu-20.04