-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix clang-format for recent PRs and new rules (#212)
Note that LLVM does not support proper version matching, since the attempt to use it from cmake apparently failed: https://reviews.llvm.org/D99451.
- Loading branch information
Showing
5 changed files
with
147 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,129 +1,129 @@ | ||
| name: Build and Test | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - "master" | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| # This allows a subsequently queued workflow run to interrupt previous runs | ||
| concurrency: | ||
| group: '${{ github.workflow }} @ ${{ github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}' | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| build: | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - os: ubuntu-latest | ||
| - os: macos-latest | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Setup LLVM (Linux) | ||
| if: ${{ runner.os == 'Linux' }} | ||
| run: | | ||
| wget https://apt.llvm.org/llvm.sh | ||
| chmod +x llvm.sh | ||
| sudo ./llvm.sh 19 all | ||
| sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 160 | ||
| sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 160 | ||
| sudo update-alternatives --install /usr/bin/lli lli /usr/bin/lli-19 160 | ||
| sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-19 160 | ||
| - name: Setup LLVM and GCC (MacOS) | ||
| if: ${{ runner.os == 'macOS' }} | ||
| run: | | ||
| brew install llvm@19 | ||
| echo "$(brew --prefix llvm@19)/bin" >> $GITHUB_PATH | ||
| echo "CC=$(brew --prefix llvm@19)/bin/clang" >> $GITHUB_ENV | ||
| echo "CXX=$(brew --prefix llvm@19)/bin/clang++" >> $GITHUB_ENV | ||
| cd /usr/local/bin | ||
| ln -s gcc-11 gcc | ||
| - name: Update Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.x' | ||
|
|
||
| - name: Install PyTest | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install pytest pytest-xdist | ||
| - name: Check formatting | ||
| if: ${{ runner.os == 'Linux' }} | ||
| run: find . -iname '*.h' -o -iname '*.cpp' | xargs clang-format -Werror --dry-run --style=LLVM --verbose | ||
|
|
||
| - name: Build | ||
| run: | | ||
| mkdir build | ||
| cmake -S . -B build -DLLVM_INCLUDE_TESTS=On -DLLVM_DIR=/usr/lib/llvm-19/cmake | ||
| cmake --build build | ||
| - name: Test | ||
| run: | | ||
| gcc --version | ||
| pytest -n 16 | ||
| # The llvm-dev package doesn't exist for Windows, so we need to build LLVM ourselves. | ||
| build-windows: | ||
| runs-on: windows-latest | ||
| env: | ||
| SCCACHE_GHA_ENABLED: "true" | ||
| steps: | ||
| - name: Checkout LLVM | ||
| id: checkout-llvm | ||
| uses: actions/checkout@master | ||
| with: | ||
| repository: llvm/llvm-project | ||
| ref: llvmorg-19.1.1 | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| path: ${{ github.workspace }}/llvm/projects/llvm-cbe | ||
|
|
||
| - name: Update Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.x' | ||
|
|
||
| - name: Install PyTest | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install pytest pytest-xdist | ||
| - name: Initialize LLVM build cache | ||
| uses: mozilla-actions/sccache-action@v0.0.3 | ||
|
|
||
| - name: Build | ||
| shell: pwsh | ||
| run: | | ||
| $vsWhere = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe' | ||
| $visualStudioInstallationPath = & $vsWhere -latest -property installationPath | ||
| Import-Module (Join-Path $visualStudioInstallationPath 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll') | ||
| Enter-VsDevShell -VsInstallPath $visualStudioInstallationPath -DevCmdArguments '-arch=x64 -host_arch=x64' | ||
| cd ${{ github.workspace }} | ||
| if (!(Test-Path '${{ github.workspace }}\build\')) { mkdir '${{ github.workspace }}\build' } | ||
| cmake -S llvm -B build -G Ninja -DLLVM_INCLUDE_TESTS=On -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache | ||
| cmake --build build | ||
| - name: Test | ||
| shell: pwsh | ||
| run: | | ||
| $vsWhere = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe' | ||
| $visualStudioInstallationPath = & $vsWhere -latest -property installationPath | ||
| Import-Module (Join-Path $visualStudioInstallationPath 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll') | ||
| Enter-VsDevShell -VsInstallPath $visualStudioInstallationPath -DevCmdArguments '-arch=x64 -host_arch=x64' | ||
| cd (Join-Path '${{ github.workspace }}' 'llvm\projects\llvm-cbe') | ||
| $env:PATH=$env:Path + ";${{ github.workspace }}\build\bin" | ||
| $env:LLVMToolDir="${{ github.workspace }}\build\bin" | ||
| pytest -n 16 | ||
| name: Build and Test | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - "master" | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| # This allows a subsequently queued workflow run to interrupt previous runs | ||
| concurrency: | ||
| group: '${{ github.workflow }} @ ${{ github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}' | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| build: | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - os: ubuntu-latest | ||
| - os: macos-latest | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Setup LLVM (Linux) | ||
| if: ${{ runner.os == 'Linux' }} | ||
| run: | | ||
| wget https://apt.llvm.org/llvm.sh | ||
| chmod +x llvm.sh | ||
| sudo ./llvm.sh 19 all | ||
| sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 160 | ||
| sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 160 | ||
| sudo update-alternatives --install /usr/bin/lli lli /usr/bin/lli-19 160 | ||
| sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-19 160 | ||
| - name: Setup LLVM and GCC (MacOS) | ||
| if: ${{ runner.os == 'macOS' }} | ||
| run: | | ||
| brew install llvm@19 gcc@14 | ||
| echo "$(brew --prefix llvm@19)/bin" >> $GITHUB_PATH | ||
| echo "CC=$(brew --prefix llvm@19)/bin/clang" >> $GITHUB_ENV | ||
| echo "CXX=$(brew --prefix llvm@19)/bin/clang++" >> $GITHUB_ENV | ||
| cd /usr/local/bin | ||
| ln -s `which gcc-14` gcc | ||
| - name: Update Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.x' | ||
|
|
||
| - name: Install PyTest | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install pytest pytest-xdist | ||
| - name: Check formatting | ||
| if: ${{ runner.os == 'Linux' }} | ||
| run: find . -iname '*.h' -o -iname '*.cpp' | xargs clang-format -Werror --dry-run --style=LLVM --verbose | ||
|
|
||
| - name: Build | ||
| run: | | ||
| mkdir build | ||
| cmake -S . -B build -DLLVM_INCLUDE_TESTS=On -DLLVM_DIR=/usr/lib/llvm-19/cmake | ||
| cmake --build build | ||
| - name: Test | ||
| run: | | ||
| gcc --version | ||
| pytest -n 16 | ||
| # The llvm-dev package doesn't exist for Windows, so we need to build LLVM ourselves. | ||
| build-windows: | ||
| runs-on: windows-latest | ||
| env: | ||
| SCCACHE_GHA_ENABLED: "true" | ||
| steps: | ||
| - name: Checkout LLVM | ||
| id: checkout-llvm | ||
| uses: actions/checkout@master | ||
| with: | ||
| repository: llvm/llvm-project | ||
| ref: llvmorg-19.1.1 | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| path: ${{ github.workspace }}/llvm/projects/llvm-cbe | ||
|
|
||
| - name: Update Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.x' | ||
|
|
||
| - name: Install PyTest | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install pytest pytest-xdist | ||
| - name: Initialize LLVM build cache | ||
| uses: mozilla-actions/sccache-action@v0.0.3 | ||
|
|
||
| - name: Build | ||
| shell: pwsh | ||
| run: | | ||
| $vsWhere = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe' | ||
| $visualStudioInstallationPath = & $vsWhere -latest -property installationPath | ||
| Import-Module (Join-Path $visualStudioInstallationPath 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll') | ||
| Enter-VsDevShell -VsInstallPath $visualStudioInstallationPath -DevCmdArguments '-arch=x64 -host_arch=x64' | ||
| cd ${{ github.workspace }} | ||
| if (!(Test-Path '${{ github.workspace }}\build\')) { mkdir '${{ github.workspace }}\build' } | ||
| cmake -S llvm -B build -G Ninja -DLLVM_INCLUDE_TESTS=On -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache | ||
| cmake --build build | ||
| - name: Test | ||
| shell: pwsh | ||
| run: | | ||
| $vsWhere = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe' | ||
| $visualStudioInstallationPath = & $vsWhere -latest -property installationPath | ||
| Import-Module (Join-Path $visualStudioInstallationPath 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll') | ||
| Enter-VsDevShell -VsInstallPath $visualStudioInstallationPath -DevCmdArguments '-arch=x64 -host_arch=x64' | ||
| cd (Join-Path '${{ github.workspace }}' 'llvm\projects\llvm-cbe') | ||
| $env:PATH=$env:Path + ";${{ github.workspace }}\build\bin" | ||
| $env:LLVMToolDir="${{ github.workspace }}\build\bin" | ||
| pytest -n 16 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ class Foo { | |
|
|
||
| int main() { | ||
| int y = 0; | ||
| { Foo f(&y); } | ||
| { | ||
| Foo f(&y); | ||
| } | ||
| return y; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ | |
| '-Wall', | ||
| '-Wno-unused-function', | ||
| '-Wno-unused-variable', | ||
| '-Wno-uninitialized', | ||
| '-Werror', | ||
| ] | ||
|
|
||
|
|
||