Merge pull request #589 from libexpat/clang-14

Actions: Upgrade Clang from 13 to 14
This commit is contained in:
Sebastian Pipping 2022-03-25 17:06:41 +01:00 committed by GitHub
commit 011c4b5a5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 9 deletions

View File

@ -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 \

View File

@ -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 \

View File

@ -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}:"

View File

@ -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