diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2022-08-20 15:21:39 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2022-09-09 01:53:05 +0200 |
| commit | 55ebc6d04eb1607d8fdb9c058439f08e25be0aa9 (patch) | |
| tree | 20ebc6cf8f107f34c6731a1a7cb6a00ab2c43c32 | |
| parent | 1156ae7dca6515b386fda6c4f63b9326db1ed6b0 (diff) | |
| download | libexpat-git-55ebc6d04eb1607d8fdb9c058439f08e25be0aa9.tar.gz | |
GitHub Actions: Stop installing Clang when not used
| -rw-r--r-- | .github/workflows/coverage.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 48 |
2 files changed, 25 insertions, 33 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 542898ea..3de03475 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -43,23 +43,13 @@ jobs: CFLAGS: -g3 -pipe steps: - uses: actions/checkout@v3.0.2 - - name: Add Clang/LLVM repositories - run: |- - set -x - source /etc/os-release - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-14 main" - name: Install build dependencies - # NOTE: Please note the version-specific ${PATH} extension for Clang in .travis.sh run: |- set -x -u -o pipefail source /etc/os-release sudo apt-get update sudo apt-get install --yes --no-install-recommends -V \ - clang-14 \ - clang-format-14 \ - llvm-14 \ cmake \ docbook2x \ dos2unix \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 328bdd56..7e05f80a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -81,29 +81,6 @@ jobs: CFLAGS: -g3 -pipe steps: - uses: actions/checkout@v3.0.2 - - name: Add Clang/LLVM repositories - run: |- - set -x - source /etc/os-release - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-14 main" - - name: Install build dependencies - # NOTE: Please note the version-specific ${PATH} extension for Clang in .travis.sh - run: |- - sudo apt-get update - sudo apt-get install --yes --no-install-recommends -V \ - clang-14 \ - clang-format-14 \ - llvm-14 \ - cmake \ - docbook2x \ - dos2unix \ - gcc-multilib \ - g++-multilib \ - lcov \ - libbsd-dev \ - lzip \ - moreutils - name: Install build dependencies (MinGW) if: "${{ contains(matrix.FLAT_ENV, 'mingw') }}" run: |- @@ -129,6 +106,31 @@ jobs: mingw-w64 \ wine-stable \ wine32:i386 + - name: Install build dependencies (Non-MinGW) + if: "${{ ! contains(matrix.FLAT_ENV, 'mingw') }}" + run: |- + set -x + source /etc/os-release + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo add-apt-repository "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-14 main" + sudo apt-get update # due to new repository + # NOTE: Please note the version-specific ${PATH} extension for Clang in .travis.sh + sudo apt-get install --yes --no-install-recommends -V \ + clang-14 \ + clang-format-14 \ + llvm-14 + - name: Install build dependencies (common) + run: |- + sudo apt-get install --yes --no-install-recommends -V \ + cmake \ + docbook2x \ + dos2unix \ + gcc-multilib \ + g++-multilib \ + lcov \ + libbsd-dev \ + lzip \ + moreutils - name: Perform check "${{ matrix.MODE }}" env: MODE: ${{ matrix.MODE }} |