Fix Linux CI workflow

PiratesAhoy · Dec 16, 2023 · 9055e1d · 9055e1d
1 parent 76a6e59
commit 9055e1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -36,10 +36,6 @@ jobs:
         configuration: [Debug]
     name: 'linux [${{ matrix.configuration}}]'
     steps:
-    # Workaround for C++20 build issues
-    - uses: mjp41/workaround8649@7929373c0fe5caf844d8115adccef39e3b5362e7
-      with:
-        os: ubuntu-latest
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
@@ -49,17 +45,17 @@ jobs:
         # fix for conan ci
         sudo apt-get install libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxft-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev
     - name: Install Conan
-      run: pip install conan==1.59.0
+      run: pip install conan==1.62.0
     - name: Configure with cmake
       run: |
-        export CC=clang-14
-        export CXX=clang++-14
+        export CC=clang-15
+        export CXX=clang++-15
         ${CXX} --version
         mkdir build && cd build
         conan profile new default --detect
         conan profile update conf.tools.system.package_manager:mode=install default
         conan profile update conf.tools.system.package_manager:sudo=True default
-        cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.configuration}}
+        cmake .. -DSTORM_USE_CONAN_SDL=OFF -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.configuration}}
     - name: Build dependencies
       run: ninja dependencies
       working-directory: build

diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -39,7 +39,7 @@ jobs:
         submodules: 'recursive'
     - uses: ilammy/msvc-dev-cmd@v1
     - name: Install Conan
-      run: pip install conan==1.60.0
+      run: pip install conan==1.62.0
     - uses: lukka/get-cmake@latest
     - name: Configure CMake w/ Conan
       run: |