mirror of
https://github.com/libexpat/libexpat.git
synced 2025-04-04 12:54:58 +00:00
Merge pull request #810 from libexpat/clang-18
CI: Upgrade to Clang 18 (except clang-tidy and clang-format)
This commit is contained in:
Sebastian Pipping
GitHub
commit
183270d565
4 changed files with 78 additions and 16 deletions
5
.ci.sh
5
.ci.sh
|
|
@ -39,7 +39,7 @@ if [[ ${RUNNER_OS} = macOS ]]; then
|
|||
export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
|
||||
export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
|
||||
elif [[ ${RUNNER_OS} = Linux ]]; then
|
||||
export PATH="/usr/lib/llvm-17/bin:${PATH}"
|
||||
export PATH="/usr/lib/llvm-18/bin:${PATH}"
|
||||
else
|
||||
echo "Unsupported RUNNER_OS \"${RUNNER_OS}\"." >&2
|
||||
exit 1
|
||||
|
|
@ -65,9 +65,6 @@ elif [[ ${MODE} = cmake-oos ]]; then
|
|||
make VERBOSE=1 CTEST_OUTPUT_ON_FAILURE=1 all test
|
||||
make DESTDIR="${PWD}"/ROOT install
|
||||
find ROOT -printf "%P\n" | sort
|
||||
elif [[ ${MODE} = clang-format ]]; then
|
||||
./apply-clang-format.sh
|
||||
git diff --exit-code
|
||||
elif [[ ${MODE} = coverage-sh ]]; then
|
||||
./coverage.sh
|
||||
else
|
||||
|
|
|
|||
67
.github/workflows/clang-format.yml
vendored
Normal file
67
.github/workflows/clang-format.yml
vendored
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
# __ __ _
|
||||
# ___\ \/ /_ __ __ _| |_
|
||||
# / _ \\ /| '_ \ / _` | __|
|
||||
# | __// \| |_) | (_| | |_
|
||||
# \___/_/\_\ .__/ \__,_|\__|
|
||||
# |_| XML parser
|
||||
#
|
||||
# Copyright (c) 2024 Sebastian Pipping <sebastian@pipping.org>
|
||||
# Licensed under the MIT license:
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining
|
||||
# a copy of this software and associated documentation files (the
|
||||
# "Software"), to deal in the Software without restriction, including
|
||||
# without limitation the rights to use, copy, modify, merge, publish,
|
||||
# distribute, sublicense, and/or sell copies of the Software, and to permit
|
||||
# persons to whom the Software is furnished to do so, subject to the
|
||||
# following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
|
||||
# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
# USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
name: Enforce clang-format clean code
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
push:
|
||||
schedule:
|
||||
- cron: '0 2 * * 5' # Every Friday at 2am
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
clang_format:
|
||||
name: Enforce clang-format clean code
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Install clang-format 17
|
||||
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 https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
|
||||
sudo apt-get update # due to new repository
|
||||
sudo apt-get install --yes --no-install-recommends -V \
|
||||
clang-format-17 \
|
||||
moreutils
|
||||
echo /usr/lib/llvm-17/bin >>"${GITHUB_PATH}"
|
||||
|
||||
- name: Run clang-format
|
||||
run: |
|
||||
set -x
|
||||
cd expat/
|
||||
./apply-clang-format.sh
|
||||
git config color.diff always
|
||||
git diff --exit-code # i.e. fail CI when there is a diff (and present it)
|
||||
12
.github/workflows/fuzzing.yml
vendored
12
.github/workflows/fuzzing.yml
vendored
|
|
@ -46,18 +46,18 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
|
||||
- name: Install Clang 17
|
||||
- name: Install Clang 18
|
||||
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 https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
|
||||
sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-18 main"
|
||||
sudo apt-get update # due to new repository
|
||||
sudo apt-get install --yes --no-install-recommends -V \
|
||||
clang-17 \
|
||||
libclang-rt-17-dev \
|
||||
llvm-17
|
||||
echo /usr/lib/llvm-17/bin >>"${GITHUB_PATH}"
|
||||
clang-18 \
|
||||
libclang-rt-18-dev \
|
||||
llvm-18
|
||||
echo /usr/lib/llvm-18/bin >>"${GITHUB_PATH}"
|
||||
|
||||
- name: Build Expat fuzzers
|
||||
run: |
|
||||
|
|
|
|||
10
.github/workflows/linux.yml
vendored
10
.github/workflows/linux.yml
vendored
|
|
@ -50,7 +50,6 @@ jobs:
|
|||
- MODE: distcheck
|
||||
- MODE: qa-sh
|
||||
FLAT_ENV: CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=address
|
||||
- MODE: clang-format
|
||||
- MODE: cmake-oos
|
||||
FLAT_ENV: CMAKE_ARGS="-DEXPAT_ATTR_INFO=ON -DEXPAT_BUILD_FUZZERS=ON -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
|
||||
- MODE: qa-sh
|
||||
|
|
@ -119,13 +118,12 @@ jobs:
|
|||
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 https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
|
||||
sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-18 main"
|
||||
sudo apt-get update # due to new repository
|
||||
# NOTE: Please note the version-specific ${PATH} extension for Clang adding /usr/lib/llvm-17/bin in .ci.sh
|
||||
# NOTE: Please note the version-specific ${PATH} extension for Clang adding /usr/lib/llvm-18/bin in .ci.sh
|
||||
sudo apt-get install --yes --no-install-recommends -V \
|
||||
clang-17 \
|
||||
clang-format-17 \
|
||||
libclang-rt-17-dev
|
||||
clang-18 \
|
||||
libclang-rt-18-dev
|
||||
- name: Install build dependencies (common)
|
||||
run: |-
|
||||
sudo apt-get install --yes --no-install-recommends -V \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue