From a89120eaab88b4baad9942e809373e93d9428178 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 3 Oct 2022 13:30:09 +0200 Subject: [PATCH] Remove unneeded targets according to checklist --- .circleci/config.yml | 67 ------ .github/workflows/build-and-test-all.yml | 267 ----------------------- .github/workflows/builder.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/secpoll.yml | 28 --- .github/workflows/spelling.yml | 16 -- .github/workflows/spelling2.yml | 32 --- 8 files changed, 3 insertions(+), 413 deletions(-) delete mode 100644 .github/workflows/secpoll.yml delete mode 100644 .github/workflows/spelling.yml delete mode 100644 .github/workflows/spelling2.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index edfecba6d1..2e1acb6885 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1056,73 +1056,6 @@ workflows: branches: only: master jobs: - - coverity-auth: - context: auth-coverity - - coverity-dnsdist: - context: dnsdist-coverity - coverity-recursor: context: recursor-coverity - build-and-test-all: - jobs: - - checkout - - build-auth: - requires: - - checkout - - test-auth-regress-odbc-sqlite3: - requires: - - build-auth - - test-auth-regress-odbc-mssql: - requires: - - build-auth - - test-auth-regress-geoip: - requires: - - build-auth - - test-auth-regress-ldap: - requires: - - build-auth - - build-docs: - jobs: - - checkout - - build-auth-docs: - filters: - branches: - ignore: master - requires: - - checkout - - build-recursor-docs: - filters: - branches: - ignore: master - requires: - - checkout - - build-dnsdist-docs: - filters: - branches: - ignore: master - requires: - - checkout - - # These actually deploy - - deploy-auth-docs: - context: docs - filters: - branches: - only: master - requires: - - checkout - - deploy-recursor-docs: - context: docs - filters: - branches: - only: master - requires: - - checkout - - deploy-dnsdist-docs: - context: docs - filters: - branches: - only: master - requires: - - checkout diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index 14b98c2a67..7cf156c9f3 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -8,45 +8,6 @@ on: - cron: '0 22 * * 3' jobs: - build-auth: - name: build auth - runs-on: ubuntu-20.04 - env: - UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp" - ASAN_OPTIONS: detect_leaks=0 - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - name: get timestamp for cache - id: get-stamp - run: | - echo "::set-output name=stamp::$(/bin/date +%s)" - shell: bash - - name: let GitHub cache our ccache data - uses: actions/cache@v2 - 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-auth-build-deps - - run: inv ci-autoconf - - run: inv ci-auth-configure - - run: inv ci-auth-make - - run: inv ci-auth-install-remotebackend-test-deps - - run: inv ci-auth-run-unit-tests - - run: inv ci-make-install - - run: ccache -s - - name: Store the binaries - uses: actions/upload-artifact@v2 # this takes 30 seconds, maybe we want to tar - with: - name: pdns-auth - path: /opt/pdns-auth - retention-days: 1 - build-recursor: name: build recursor runs-on: ubuntu-20.04 @@ -93,189 +54,6 @@ jobs: path: /opt/pdns-recursor retention-days: 1 - build-dnsdist: - name: build dnsdist - runs-on: ubuntu-20.04 - strategy: - matrix: - sanitizers: [ubsan+asan, tsan] - features: [least, full] - exclude: - - sanitizers: tsan - features: least - env: - UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp" - ASAN_OPTIONS: detect_leaks=0 - SANITIZERS: ${{ matrix.sanitizers }} - defaults: - run: - working-directory: ./pdns/dnsdistdist/ - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - name: get timestamp for cache - id: get-stamp - run: | - echo "::set-output name=stamp::$(/bin/date +%s)" - shell: bash - - name: let GitHub cache our ccache data - uses: actions/cache@v2 - with: - path: ~/.ccache - key: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-ccache-${{ steps.get-stamp.outputs.stamp }} - restore-keys: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-ccache- - - run: ../../build-scripts/gh-actions-setup-inv # this runs apt update+upgrade - - run: inv apt-fresh - - run: inv install-clang - - run: inv install-dnsdist-build-deps - - run: inv ci-autoconf - - run: inv ci-dnsdist-configure ${{ matrix.features }} - - run: inv ci-dnsdist-make - - run: inv ci-dnsdist-run-unit-tests - - run: inv ci-make-install - - run: ccache -s - - name: Store the binaries - uses: actions/upload-artifact@v2 # this takes 30 seconds, maybe we want to tar - with: - name: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }} - path: /opt/dnsdist - retention-days: 1 - - test-auth-api: - needs: build-auth - runs-on: ubuntu-20.04 - env: - UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp" - ASAN_OPTIONS: detect_leaks=0 - TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/dnsdistdist/dnsdist-tsan.supp" - strategy: - matrix: - include: - - backend: gsqlite3 - image: coscale/docker-sleep - - backend: gmysql - image: mysql:5 - - backend: gpgsql - image: postgres:9 - - backend: lmdb - image: coscale/docker-sleep - fail-fast: false - services: - database: - image: ${{ matrix.image }} - env: - POSTGRES_USER: runner - POSTGRES_HOST_AUTH_METHOD: trust - MYSQL_ALLOW_EMPTY_PASSWORD: 1 - ports: - - 3306:3306 - - 5432:5432 - # FIXME: this works around dist-upgrade stopping all docker containers. dist-upgrade is huge on these images anyway. Perhaps we do want to run our tasks in a Docker container too. - options: >- - --restart always - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - name: Fetch the binaries - uses: actions/download-artifact@v2 - with: - name: pdns-auth - path: /opt/pdns-auth - # - name: Setup upterm session - # uses: lhotari/action-upterm@v1 - - run: build-scripts/gh-actions-setup-inv # this runs apt update+upgrade - - run: inv install-clang-runtime - - run: inv install-auth-test-deps -b ${{ matrix.backend }} - - run: inv test-api auth -b ${{ matrix.backend }} - - test-auth-backend: - needs: build-auth - runs-on: ubuntu-20.04 - env: - UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp" - ASAN_OPTIONS: detect_leaks=0 - strategy: - matrix: - include: - - backend: remote - image: coscale/docker-sleep - - backend: gmysql - image: mysql:5 - - backend: gmysql - image: mariadb:10 - - backend: gpgsql - image: postgres:9 - - backend: gsqlite3 # this also runs regression-tests.nobackend and pdnsutil test-algorithms - image: coscale/docker-sleep - - backend: lmdb - image: coscale/docker-sleep - - backend: bind - image: coscale/docker-sleep - - backend: geoip - image: coscale/docker-sleep - - backend: lua2 - image: coscale/docker-sleep - - backend: tinydns - image: coscale/docker-sleep - - backend: authpy - image: coscale/docker-sleep - fail-fast: false - services: - database: - image: ${{ matrix.image }} - env: - POSTGRES_USER: runner - POSTGRES_HOST_AUTH_METHOD: trust - MYSQL_ALLOW_EMPTY_PASSWORD: 1 - ports: - - 3306:3306 - - 5432:5432 - # FIXME: this works around dist-upgrade stopping all docker containers. dist-upgrade is huge on these images anyway. Perhaps we do want to run our tasks in a Docker container too. - options: >- - --restart always - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - name: Fetch the binaries - uses: actions/download-artifact@v2 - with: - name: pdns-auth - path: /opt/pdns-auth - # - name: Setup upterm session - # uses: lhotari/action-upterm@v1 - # FIXME: install recursor for backends that have ALIAS - - run: build-scripts/gh-actions-setup-inv # this runs apt update+upgrade - - run: inv install-clang-runtime - - run: inv install-auth-test-deps -b ${{ matrix.backend }} - - run: inv test-auth-backend -b ${{ matrix.backend }} - - test-ixfrdist: - needs: build-auth - runs-on: ubuntu-20.04 - env: - UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp" - ASAN_OPTIONS: detect_leaks=0 - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - name: Fetch the binaries - uses: actions/download-artifact@v2 - with: - name: pdns-auth - path: /opt/pdns-auth - - run: build-scripts/gh-actions-setup-inv # this runs apt update+upgrade - - run: inv install-clang-runtime - - run: inv install-auth-test-deps - - run: inv test-ixfrdist - test-recursor-api: needs: build-recursor runs-on: ubuntu-20.04 @@ -357,54 +135,9 @@ jobs: - run: inv install-rec-bulk-deps - run: inv test-bulk-recursor ${{ matrix.threads }} ${{ matrix.mthreads }} ${{ matrix.shards }} - test-dnsdist-regression: - needs: build-dnsdist - runs-on: ubuntu-20.04 - strategy: - matrix: - sanitizers: [ubsan+asan, tsan] - env: - UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp" - ASAN_OPTIONS: detect_leaks=0 - TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/dnsdistdist/dnsdist-tsan.supp" - # IncludeDir tests are disabled because of a weird interaction between TSAN and these tests which ever only happens on GH actions - SKIP_INCLUDEDIR_TESTS: yes - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - name: Fetch the binaries - uses: actions/download-artifact@v2 - with: - name: dnsdist-full-${{ matrix.sanitizers }} - path: /opt/dnsdist - - run: build-scripts/gh-actions-setup-inv # this runs apt update+upgrade - - run: inv install-clang-runtime - - run: inv install-dnsdist-test-deps - - run: inv test-dnsdist - - swagger-syntax-check: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - run: build-scripts/gh-actions-setup-inv # this runs apt update+upgrade - - run: inv install-swagger-tools - - run: inv swagger-syntax-check - collect: needs: - - build-auth - - build-dnsdist - build-recursor - - swagger-syntax-check - - test-auth-api - - test-auth-backend - - test-dnsdist-regression - - test-ixfrdist - test-recursor-api - test-recursor-regression - test-recursor-bulk diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index f068496360..fc6e23e28f 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - product: ['authoritative', 'recursor', 'dnsdist'] + product: ['recursor'] os: - centos-7 - ubuntu-bionic diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ce5dd3251f..6fd588d4ff 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,7 +17,7 @@ jobs: # Override automatic language detection by changing the below list # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] language: ['cpp'] - product: ['auth', 'rec', 'dnsdist'] + product: ['rec'] # Learn more... # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 09c3dd9049..77ba6db45a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - product: ['auth', 'recursor', 'dnsdist'] + product: ['recursor'] steps: - uses: actions/checkout@v2.3.4 with: diff --git a/.github/workflows/secpoll.yml b/.github/workflows/secpoll.yml deleted file mode 100644 index cb1151792d..0000000000 --- a/.github/workflows/secpoll.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: 'Verify secpoll zone syntax' - -on: - push: - pull_request: - -jobs: - build: - name: check secpoll zone - # on a ubuntu-20.04 VM - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 5 - submodules: recursive - - run: sh docs/secpoll-check.sh docs/secpoll.zone - - run: echo 'deb [arch=amd64] http://repo.powerdns.com/ubuntu focal-auth-master main' | sudo tee /etc/apt/sources.list.d/pdns.list - - run: "echo -ne 'Package: pdns-*\nPin: origin repo.powerdns.com\nPin-Priority: 600\n' | sudo tee /etc/apt/preferences.d/pdns" - - run: sudo curl https://repo.powerdns.com/CBC8B383-pub.asc -o /etc/apt/trusted.gpg.d/CBC8B383-pub.asc - - run: sudo apt-get update - - run: sudo systemctl mask pdns - - run: sudo apt-get install -y pdns-server pdns-backend-sqlite3 - - run: "echo -ne 'launch=gsqlite3\ngsqlite3-database=/var/lib/powerdns/pdns.sqlite3\n' | sudo tee /etc/powerdns/pdns.conf" - - run: sudo sqlite3 /var/lib/powerdns/pdns.sqlite3 < /usr/share/doc/pdns-backend-sqlite3/schema.sqlite3.sql - - run: sudo pdnsutil load-zone secpoll.powerdns.com docs/secpoll.zone - - run: sudo pdnsutil check-zone secpoll.powerdns.com diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml deleted file mode 100644 index 7cf3961491..0000000000 --- a/.github/workflows/spelling.yml +++ /dev/null @@ -1,16 +0,0 @@ -# spelling.yml is disabled per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p -name: Workflow should not run! -on: - push: - branches: '' - -jobs: - placeholder: - name: Should be disabled - runs-on: ubuntu-latest - if: false - steps: - - name: Task - run: | - echo 'Running this task would be bad' - exit 1 diff --git a/.github/workflows/spelling2.yml b/.github/workflows/spelling2.yml deleted file mode 100644 index e24b9dfd1b..0000000000 --- a/.github/workflows/spelling2.yml +++ /dev/null @@ -1,32 +0,0 @@ -# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p -name: Spell checking -on: - push: - branches: - - "**" - tags-ignore: - - "**" - pull_request_target: - branches: - - "**" - tags-ignore: - - "**" - types: ['opened', 'reopened', 'synchronize'] - -jobs: - spelling: - name: Spell checking - runs-on: ubuntu-latest - steps: - - name: checkout-merge - if: "contains(github.event_name, 'pull_request')" - uses: actions/checkout@v2 - with: - ref: refs/pull/${{github.event.pull_request.number}}/merge - - name: checkout - if: ${{ github.event_name == 'push' }} - uses: actions/checkout@v2 - - uses: check-spelling/check-spelling@v0.0.19 - id: spelling - with: - config: .github/actions/spell-check -- 2.47.2