mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-14 09:22:13 -05:00
Update to clang-16
Use runner Ubuntu 22.04 for clang-16 Remove unused code detected by clang-16
This commit is contained in:
1 parent
9ac518fbe0
commit
ff6472c6b7
8 files changed
+30
-32
No files matched your search
@@ -33,11 +33,12 @@ jobs:
|
||||
vcpkg-triplet: x64-windows,
|
||||
build-python-module: true,
|
||||
execute-unit-tests: true,
|
||||
execute-pytests: true,
|
||||
unity-build: true,
|
||||
publish-to-pypi: false,
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu Latest gcc",
|
||||
name: "Ubuntu 20.04 gcc",
|
||||
os: ubuntu-20.04,
|
||||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
@@ -45,18 +46,20 @@ jobs:
|
||||
vcpkg-triplet: x64-linux,
|
||||
build-python-module: true,
|
||||
execute-unit-tests: true,
|
||||
execute-pytests: true,
|
||||
unity-build: false,
|
||||
publish-to-pypi: true,
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu Latest clang",
|
||||
os: ubuntu-20.04,
|
||||
cc: "clang",
|
||||
cxx: "clang++",
|
||||
name: "Ubuntu 22.04 clang-16",
|
||||
os: ubuntu-22.04,
|
||||
cc: "clang-16",
|
||||
cxx: "clang++-16",
|
||||
vcpkg-response-file: vcpkg_x64-linux.txt,
|
||||
vcpkg-triplet: x64-linux,
|
||||
build-python-module: true,
|
||||
execute-unit-tests: true,
|
||||
execute-pytests: false,
|
||||
unity-build: false,
|
||||
publish-to-pypi: false,
|
||||
}
|
||||
@@ -139,7 +142,7 @@ jobs:
|
||||
|
||||
- name: Set apt mirror
|
||||
# see https://github.com/actions/runner-images/issues/7048
|
||||
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||
if: contains( matrix.config.os, 'ubuntu')
|
||||
run: |
|
||||
# make sure there is a `\t` between URL and `priority:*` attributes
|
||||
printf 'http://azure.archive.ubuntu.com/ubuntu priority:1\n' | sudo tee /etc/apt/mirrors.txt
|
||||
@@ -147,11 +150,24 @@ jobs:
|
||||
sudo sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/mirrors.txt/' /etc/apt/sources.list
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||
if: contains( matrix.config.os, 'ubuntu')
|
||||
run: |
|
||||
sudo apt-get update --option="APT::Acquire::Retries=3"
|
||||
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
||||
|
||||
- name: Install gcc-10
|
||||
if: contains( matrix.config.cc, 'gcc')
|
||||
run: |
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10
|
||||
|
||||
- name: Install clang-16
|
||||
if: contains( matrix.config.cc, 'clang')
|
||||
run: |
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11
|
||||
sudo apt-get upgrade
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
sudo chmod +x llvm.sh
|
||||
sudo ./llvm.sh 16 all
|
||||
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v3
|
||||
@@ -170,14 +186,14 @@ jobs:
|
||||
appendedCacheKey: ${{ matrix.config.os }}-${{ matrix.config.cxx }}-cache-key-v2
|
||||
|
||||
- name: Cache dynamic version of OpenSSL (Linux)
|
||||
if: ${{contains( matrix.config.os, 'ubuntu_disabled') }}
|
||||
if: contains( matrix.config.os, 'ubuntu_disabled')
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic
|
||||
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v05
|
||||
|
||||
- name: Install dynamic version of OpenSSL (Linux)
|
||||
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||
if: contains( matrix.config.os, 'ubuntu')
|
||||
run: |
|
||||
$VCPKG_ROOT/vcpkg install --overlay-triplets=${{ github.workspace }}/ThirdParty/vcpkg-custom-triplets --triplet x64-linux-dynamic openssl
|
||||
|
||||
@@ -239,7 +255,7 @@ jobs:
|
||||
${{ steps.python-path.outputs.PYTHON_EXECUTABLE }} -m mypy *.py generated/generated_classes.py
|
||||
|
||||
- name: Run pytest
|
||||
if: matrix.config.build-python-module
|
||||
if: matrix.config.execute-pytests
|
||||
env:
|
||||
RESINSIGHT_EXECUTABLE: ${{ runner.workspace }}/ResInsight/cmakebuild/ApplicationExeCode/ResInsight
|
||||
run: |
|
||||
@@ -256,7 +272,7 @@ jobs:
|
||||
path: GrpcInterface/Python/dist
|
||||
|
||||
- name: Upload Windows install artifact
|
||||
if: ${{contains( matrix.config.os, 'windows') }}
|
||||
if: contains( matrix.config.os, 'windows')
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ResInsight-${{ matrix.config.name }}
|
||||
|
||||
Reference in new issue
Block a user