Skip to content

Commit bca9a6d

Browse files
committed
ci: update main.yml
1 parent 45df289 commit bca9a6d

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

.github/workflows/main.yml

+7-22
Original file line numberDiff line numberDiff line change
@@ -337,20 +337,11 @@ jobs:
337337
strategy:
338338
fail-fast: false
339339
matrix:
340-
runner: [ "ubuntu-22.04", "ubuntu-20.04" ]
340+
runner: [ "ubuntu-22.04" ]
341341
name: [ "Ubuntu" ]
342-
compiler: [ "GCC-12", "GCC-11", "Clang-16" ]
343-
qt: [ 5, 6 ]
342+
compiler: [ "GCC-12", "Clang-16" ]
343+
qt: [ 6 ]
344344
CMAKE_GENERATOR: [ "Ninja Multi-Config" ]
345-
exclude:
346-
- runner: "ubuntu-22.04"
347-
qt: 5
348-
- runner: "ubuntu-22.04"
349-
compiler: "GCC-11"
350-
- runner: "ubuntu-20.04"
351-
qt: 6
352-
- runner: "ubuntu-20.04"
353-
compiler: "GCC-12"
354345
runs-on: "${{ matrix.runner }}"
355346
name: "${{ matrix.name }} (${{ matrix.compiler }}, Qt${{ matrix.qt }})"
356347
env:
@@ -384,6 +375,7 @@ jobs:
384375
385376
echo "CMAKE_C_COMPILER=gcc-${compiler[1]}" >> "$GITHUB_ENV"
386377
echo "CMAKE_CXX_COMPILER=g++-${compiler[1]}" >> "$GITHUB_ENV"
378+
echo "CMAKE_LINKER=gold" >> "$GITHUB_ENV"
387379
elif [[ "${compiler[0]}" == "Clang" ]]; then
388380
curl -jLo /tmp/llvm.sh "https://apt.llvm.org/llvm.sh"
389381
chmod +x /tmp/llvm.sh
@@ -398,6 +390,7 @@ jobs:
398390
399391
echo "CMAKE_C_COMPILER=clang-${compiler[1]}" >> "$GITHUB_ENV"
400392
echo "CMAKE_CXX_COMPILER=clang++-${compiler[1]}" >> "$GITHUB_ENV"
393+
echo "CMAKE_LINKER=ld.lld-${compiler[1]}" >> "$GITHUB_ENV"
401394
else
402395
echo "Unknown Compiler"
403396
exit 1
@@ -406,13 +399,8 @@ jobs:
406399
id: qt
407400
shell: bash
408401
run: |
409-
if [[ ${{ matrix.qt }} -eq 5 ]]; then
410-
sudo apt-get -y install -V \
411-
qtbase5-dev qtbase5-private-dev libqt5svg5-dev
412-
elif [[ ${{ matrix.qt }} -eq 6 ]]; then
413-
sudo apt-get -y install -V \
414-
qt6-base-dev qt6-base-private-dev libqt6svg6-dev libgles2-mesa-dev libegl1-mesa-dev libgl1-mesa-dev
415-
fi
402+
sudo apt-get -y install -V \
403+
qt6-base-dev qt6-base-private-dev libqt6svg6-dev libgles2-mesa-dev libegl1-mesa-dev libgl1-mesa-dev
416404
- name: "Dependency: Prebuilt OBS Studio Dependencies"
417405
id: obsdeps
418406
shell: bash
@@ -480,9 +468,6 @@ jobs:
480468
cmake \
481469
-S "${{ github.workspace }}" \
482470
-B "${{ github.workspace }}/build/ci" \
483-
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/build/ci/install" \
484-
-DPACKAGE_NAME="OBSFX-${{ matrix.name }}-${{ matrix.compiler }}-Qt${{ matrix.qt }}" \
485-
-DPACKAGE_PREFIX="${{ github.workspace }}/build/package" \
486471
-DCMAKE_C_COMPILER="${{ env.CMAKE_C_COMPILER }}" \
487472
-DCMAKE_CXX_COMPILER="${{ env.CMAKE_CXX_COMPILER }}" \
488473
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \

0 commit comments

Comments
 (0)