From 89fccf20eaacb348a709be3ed15ed0fc6eb9b876 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Tue, 11 Apr 2023 21:09:10 +0200 Subject: [PATCH] [ci] Remove conan from build and static analysis github workflows --- .github/workflows/build.yml | 48 --------------------------- .github/workflows/static_analysis.yml | 22 ------------ 2 files changed, 70 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f38a2ae81..cb7fce7e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,9 +8,6 @@ jobs: container: ubuntu:rolling env: DEBIAN_FRONTEND: "noninteractive" - CONAN_USER_HOME: "${{ github.workspace }}/conan/" - CONAN_USER_HOME_SHORT: "${{ github.workspace }}/conan/s" - inexor_conan_path: "$HOME/.local/bin" strategy: fail-fast: false matrix: @@ -64,28 +61,15 @@ jobs: xorg-dev pip3 install wheel setuptools - pip3 install conan mako - name: Checkout uses: actions/checkout@v3 - - name: Cache Conan Dependencies - uses: actions/cache@v3 - with: - path: ${{ env.CONAN_USER_HOME }} - key: conan-${{ runner.os }}-${{ matrix.config.name }}-${{ matrix.config.build_type }}-${{ hashFiles('conanfile.py') }} - - name: Configure CMake shell: bash run: | export CC=${{ matrix.config.cc }} export CXX=${{ matrix.config.cxx }} - export PATH="${{ env.inexor_conan_path }}":$PATH - - # Setup conan - # Note: libstdc++11 is needed to use new libc++ ABI - conan profile new default --detect --force - conan profile update settings.compiler.libcxx=libstdc++11 default # Configure cmake cmake . \ @@ -130,19 +114,9 @@ jobs: path: release_linux_amd64_${{ matrix.config.cc }}.tar.xz retention-days: 7 - - name: Clean Up Conan - if: always() - shell: bash - run: | - conan remove "*" -f --builds --src - conan remove "*" -f --system-reqs - windows: name: ${{ matrix.config.name }} runs-on: windows-latest - env: - CONAN_USER_HOME: "${{ github.workspace }}/conan/" - CONAN_USER_HOME_SHORT: "${{ github.workspace }}/conan/s" strategy: fail-fast: false matrix: @@ -154,7 +128,6 @@ jobs: build_type: "Release", cmake_build_options: "--config Release", cmake_configure_options: '-G "Visual Studio 17 2022" -A x64', - conan_profile_update: '' } - { name: "Windows Clang", @@ -163,7 +136,6 @@ jobs: build_type: "Release", cmake_build_options: "--config Release", cmake_configure_options: '-G "Visual Studio 17 2022" -A x64 -T "LLVM_v143" -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_LINKER="lld.exe"', - conan_profile_update: 'conan profile update settings.compiler.libcxx=libstdc++11 default', } steps: @@ -171,17 +143,10 @@ jobs: shell: pwsh run: | pip3 install wheel setuptools - pip3 install conan - name: Checkout uses: actions/checkout@v3 - - name: Cache Conan Dependencies - uses: actions/cache@v3 - with: - path: ${{ env.CONAN_USER_HOME }} - key: conan-${{ runner.os }}-${{ matrix.config.name }}-${{ matrix.config.build_type }}-${{ hashFiles('conanfile.py') }} - - name: Configure LLVM if: matrix.config.compiler == 'clang' shell: pwsh @@ -190,8 +155,6 @@ jobs: curl -fsSL -o "LLVM_VS2017.zip" "https://github.com/zufuliu/llvm-utils/releases/download/v22.09/LLVM_VS2017.zip" 7z x -y "LLVM_VS2017.zip" >NUL LLVM_VS2017\install.bat - conan config init - (Get-Content "$(conan config home)\settings.yml") -replace 'v143', 'v143, LLVM_v143' | Out-File -encoding ASCII "$(conan config home)\settings.yml" - name: Configure CMake shell: pwsh @@ -199,10 +162,6 @@ jobs: $env:CC="${{ matrix.config.cc }}" $env:CXX="${{ matrix.config.cxx }}" - # Setup conan - conan profile new default --detect --force - ${{ matrix.config.conan_profile_update }} - # Configure CMake cmake . ` -Bbuild ` @@ -242,10 +201,3 @@ jobs: name: release_windows_amd64_${{ matrix.config.compiler }}.zip path: release_windows_amd64_${{ matrix.config.compiler }}.zip retention-days: 7 - - - name: Clean Up Conan - if: always() - shell: pwsh - run: | - conan remove "*" -f --builds --src - conan remove "*" -f --system-reqs diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 2a071fa24..4b3a075ce 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -8,9 +8,6 @@ jobs: container: ubuntu:rolling env: DEBIAN_FRONTEND: "noninteractive" - CONAN_USER_HOME: "${{ github.workspace }}/conan/" - CONAN_USER_HOME_SHORT: "${{ github.workspace }}/conan/s" - inexor_conan_path: "$HOME/.local/bin" steps: - name: Update environment run: | @@ -48,26 +45,14 @@ jobs: xorg-dev pip3 install wheel setuptools - pip3 install conan mako - name: Checkout uses: actions/checkout@v3 - - name: Cache Conan Dependencies - uses: actions/cache@v3 - with: - path: ${{ env.CONAN_USER_HOME }} - key: conan-${{ runner.os }}-Ubuntu GCC-Debug-${{ hashFiles('conanfile.py') }} - - name: Configure CMake run: | export CC=gcc export CXX=g++ - export PATH="${{ env.inexor_conan_path }}":$PATH - - conan profile new default --detect --force - conan profile update settings.compiler.libcxx=libstdc++11 default - cmake . -Bbuild -DCMAKE_BUILD_TYPE=Debug -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - name: Run clang-tidy @@ -79,10 +64,3 @@ jobs: clang-tidy -p build --header-filter=inexor/ --quiet {} 2>/dev/null | tee output if [ -s output ]; then exit 1; fi - - - name: Clean Up Conan - if: always() - shell: bash - run: | - conan remove "*" -f --builds --src - conan remove "*" -f --system-reqs