diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2020-06-11 13:18:07 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2020-06-11 14:17:37 +0200 |
| commit | 0664249ffc788f672856ce1198b545afa3519388 (patch) | |
| tree | 4d956f0ee5aff559415fdf5cb070af2a9e32fcbe /.github | |
| parent | 119111645be4a0c220672545111136cce87c802f (diff) | |
| download | systemd-0664249ffc788f672856ce1198b545afa3519388.tar.gz | |
ci: do the compiler-detection magic in the test script
so we have all PPA definitions at one place.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_test.yml | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 2a6f0df9c4..a860092518 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -19,26 +19,11 @@ jobs: fail-fast: false matrix: env: - # As we use postfixed clang/gcc binaries, we need to override $AR - # as well, otherwise meson falls back to ar from binutils which - # doesn't work with LTO - - { CC: "clang-10", CXX: "clang++-10", AR: "llvm-ar-10" } - - { CC: "gcc-10", CXX: "g++-10", AR: "gcc-ar-10" } + - { COMPILER: "gcc", COMPILER_VERSION: "10" } + - { COMPILER: "clang", COMPILER_VERSION: "10" } env: ${{ matrix.env }} steps: - name: Repository checkout uses: actions/checkout@v1 - - name: Configure custom APT repositories for ${{ env.CC }} - run: | - if [[ "$CC" == clang-* ]]; then - # Latest LLVM stack deb packages provided by https://apt.llvm.org/ - sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" - sudo apt-get install clang-10 llvm-10 - else - # Latest gcc stack deb packages provided by - # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get install gcc-10 - fi - - name: Build check (${{ env.CC }}) + - name: Build check (${{ env.COMPILER }}-${{ env.COMPILER_VERSION }}) run: sudo -E travis-ci/managers/ubuntu-build-check.sh |