From df27b0e63fa99008c2c1f2901fa129516ace0825 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 8 Jan 2021 14:49:09 +0100 Subject: [PATCH] codeQL: switch to testing merge commits --- .github/workflows/codeql-analysis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 041737071d..4223620ecd 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,6 +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'] # Learn more... # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection @@ -28,11 +29,6 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - # Python is required for building the Authoritative server - uses: actions/setup-python@v2 with: @@ -100,6 +96,7 @@ jobs: unixodbc-dev - name: Build auth + if: matrix.product == 'auth' run: | autoreconf -vfi ./configure --with-modules='bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe random remote tinydns' --enable-tools --enable-ixfrdist --enable-dns-over-tls --enable-experimental-pkcs11 --with-libsodium --enable-lua-records CFLAGS='-O0' CXXFLAGS='-O0' @@ -108,6 +105,7 @@ jobs: make -j8 -C pdns - name: Build dnsdist + if: matrix.product == 'dnsdist' run: | cd pdns/dnsdistdist autoreconf -vfi @@ -117,6 +115,7 @@ jobs: make -j4 dnsdist - name: Build recursor + if: matrix.product == 'rec' run: | cd pdns/recursordist autoreconf -vfi -- 2.47.2