diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-09-03 08:53:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-03 08:53:42 +0200 |
| commit | 9ec9f5c05ff32779c5ea76423adbe05487f37fa9 (patch) | |
| tree | 3e38184de0aaea4f37ee5ba019da8add9b3d0752 /.github/workflows | |
| parent | c521332793e63cad244905e3abb20ded905444fa (diff) | |
| parent | df66314bb47f1a824f35e9d5c7764305a4f103cb (diff) | |
| download | libquotient-9ec9f5c05ff32779c5ea76423adbe05487f37fa9.tar.gz libquotient-9ec9f5c05ff32779c5ea76423adbe05487f37fa9.zip | |
Merge pull request #500 from quotient-im/kitsune/bump-minimal-versions
Require CMake 3.16, kindly ask for C++20; drop qmake
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 670153eb..47e31d55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,16 +72,17 @@ jobs: - name: Setup build environment run: | if [ "${{ matrix.compiler }}" == "GCC" ]; then - if [ -n "${{ matrix.update-api }}" ]; then VERSION_POSTFIX='-9'; fi - echo "CC=gcc$VERSION_POSTFIX" >>$GITHUB_ENV - echo "CXX=g++$VERSION_POSTFIX" >>$GITHUB_ENV + CXX_VERSION_POSTFIX='-10' + echo "CC=gcc$CXX_VERSION_POSTFIX" >>$GITHUB_ENV + echo "CXX=g++$CXX_VERSION_POSTFIX" >>$GITHUB_ENV elif [[ '${{ matrix.compiler }}' == 'Clang' ]]; then - echo "CC=clang" >>$GITHUB_ENV - echo "CXX=clang++" >>$GITHUB_ENV if [[ '${{ runner.os }}' == 'Linux' ]]; then + CXX_VERSION_POSTFIX='-11' # Do CodeQL analysis on one of Linux branches echo "CODEQL_ANALYSIS=true" >>$GITHUB_ENV fi + echo "CC=clang$CXX_VERSION_POSTFIX" >>$GITHUB_ENV + echo "CXX=clang++$CXX_VERSION_POSTFIX" >>$GITHUB_ENV fi if grep -q 'refs/tags' <<<'${{ github.ref }}'; then VERSION="$(git describe --tags)" |