diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2022-03-25 17:06:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 17:06:41 +0100 |
| commit | 011c4b5a5c53c38aaa3595c3a8a2b0f887668b48 (patch) | |
| tree | d66a881819b596830e6270c8d4eaa617e1814132 | |
| parent | 5764f867d40e43e0e8d56e7645c3f1ed5631ba41 (diff) | |
| parent | 0684e6e183725dc0f46ddab8ffbe6fc9d7394054 (diff) | |
| download | libexpat-git-011c4b5a5c53c38aaa3595c3a8a2b0f887668b48.tar.gz | |
Merge pull request #589 from libexpat/clang-14
Actions: Upgrade Clang from 13 to 14
| -rw-r--r-- | .github/workflows/coverage.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 10 | ||||
| -rwxr-xr-x | .travis.sh | 2 | ||||
| -rw-r--r-- | expat/Changes | 3 |
4 files changed, 16 insertions, 9 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 8f8bb15e..a253ef4b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -45,17 +45,19 @@ jobs: - uses: actions/checkout@v3.0.0 - 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/bionic/ llvm-toolchain-bionic-13 main' + 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 dpkg --add-architecture i386 # for wine32 sudo apt-get update sudo apt-get install --yes --no-install-recommends -V \ - clang-13 \ - clang-format-13 \ - llvm-13 \ + clang-14 \ + clang-format-14 \ + llvm-14 \ cmake \ docbook2x \ dos2unix \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b72a5771..3c345a6b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -83,17 +83,19 @@ jobs: - uses: actions/checkout@v3.0.0 - 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/bionic/ llvm-toolchain-bionic-13 main' + 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 dpkg --add-architecture i386 # for wine32 sudo apt-get update sudo apt-get install --yes --no-install-recommends -V \ - clang-13 \ - clang-format-13 \ - llvm-13 \ + clang-14 \ + clang-format-14 \ + llvm-14 \ cmake \ docbook2x \ dos2unix \ @@ -39,7 +39,7 @@ if [[ ${TRAVIS_OS_NAME} = osx ]]; then export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}" export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}" elif [[ ${TRAVIS_OS_NAME} = linux ]]; then - export PATH="/usr/lib/llvm-13/bin:${PATH}" + export PATH="/usr/lib/llvm-14/bin:${PATH}" fi echo "New \${PATH}:" diff --git a/expat/Changes b/expat/Changes index e04939b8..cdca767a 100644 --- a/expat/Changes +++ b/expat/Changes @@ -9,6 +9,9 @@ Release x.x.x xxx xxxx xx xxxx "-current_version <version>" in a way compatible with GNU Libtool + Infrastructure: + #589 CI: Upgrade Clang from 13 to 14 + Special thanks to: evpobr Sam James |