ci: Remove shiboken workarounds

ubuntu-latest was upgraded by GH, it no longer has gcc-10 Checking if workaround is still needed
KDAB · Jan 6, 2025 · df08363 · df08363
1 parent 152ea3d
commit df08363
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,14 +87,6 @@ jobs:
         if: ${{ matrix.preset.pip_pgks }}
         run: echo ${{ join(matrix.preset.pip_pgks, ' ') }} | xargs pip install
 
-      - name: Hackery due Shiboken hardcoded paths
-        if: ${{ matrix.preset.pip_pgks }}
-        run: |
-          sudo mkdir -p /opt/rh/gcc-toolset-10/root/usr/bin/
-          sudo cp /usr/bin/g++-10 /opt/rh/gcc-toolset-10/root/usr/bin/c++
-          sudo mkdir -p /opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-linux-gnu/10/
-          sudo cp /usr/lib/gcc/x86_64-linux-gnu/10/cc1plus /opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-linux-gnu/10/
-
       - name: Install ninja-build tool (must be after Qt due PATH changes)
         uses: turtlesec-no/get-ninja@main
 

diff --git a/.github/workflows/python_and_static.yml b/.github/workflows/python_and_static.yml
@@ -93,14 +93,6 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Hackery due Shiboken hardcoded paths
-        if: ${{ runner.os == 'Linux' }}
-        run: |
-          sudo mkdir -p /opt/rh/gcc-toolset-10/root/usr/bin/
-          sudo cp /usr/bin/g++-10 /opt/rh/gcc-toolset-10/root/usr/bin/c++
-          sudo mkdir -p /opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-linux-gnu/10/
-          sudo cp /usr/lib/gcc/x86_64-linux-gnu/10/cc1plus /opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-linux-gnu/10/
-
       - name: Configure project
         run: cmake -S . -B ./build-${{ matrix.preset.name }} --preset ${{ matrix.preset.name }}