sneedmca/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2024-12-23 18:02:46 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert a9312c837e . Use proper GCC binary location and CCACHE changes in

Browse source 
the CI
This commit is contained in:
Fijxu 2024-03-25 00:11:11 -03:00
parent 0c2bdc6f61
commit d4375a21ef
No known key found for this signature in database
GPG key ID: 32C1DDF333EDA6A4
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci/scripts/linux/docker.sh
View file

@ -6,7 +6,7 @@
# Exit on error, rather than continuing with the rest of the script. # Exit on error, rather than continuing with the rest of the script.
set -e set -e
ccache -s ccache -sv
mkdir build || true && cd build mkdir build || true && cd build
cmake .. \ cmake .. \
@ -15,8 +15,8 @@ cmake .. \
-DSUYU_USE_PRECOMPILED_HEADERS=OFF \ -DSUYU_USE_PRECOMPILED_HEADERS=OFF \
-DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
-DCMAKE_CXX_COMPILER=/usr/bin/g++ \ -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ \
-DCMAKE_C_COMPILER=/usr/bin/gcc \ -DCMAKE_C_COMPILER=/usr/local/bin/gcc \
-DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_PREFIX="/usr" \
-DDISPLAY_VERSION=$1 \ -DDISPLAY_VERSION=$1 \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \
@ -31,7 +31,7 @@ cmake .. \
ninja ninja
ccache -s ccache -sv
ctest -VV -C Release ctest -VV -C Release

5
.forgejo/workflows/verify.yml
View file

@ -33,7 +33,6 @@ on:
env: env:
PR_NUMBER: pr${{ github.event.number }} PR_NUMBER: pr${{ github.event.number }}
CCACHE_DIR: '.ccache'
jobs: jobs:
format: format:
@ -77,13 +76,13 @@ jobs:
uses: https://code.forgejo.org/actions/cache@v3 uses: https://code.forgejo.org/actions/cache@v3
id: ccache-restore id: ccache-restore
with: with:
path: .ccache path: ~/.ccache
key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }} key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ matrix.type }}- ${{ runner.os }}-${{ matrix.type }}-
- name: Create ccache directory - name: Create ccache directory
if: steps.ccache-restore.outputs.cache-hit != 'true' if: steps.ccache-restore.outputs.cache-hit != 'true'
run: mkdir -p .ccache run: mkdir -p ~/.ccache
- name: Build - name: Build
run: ./.ci/scripts/${{ matrix.type }}/docker.sh run: ./.ci/scripts/${{ matrix.type }}/docker.sh
env: env:

3
CMakeLists.txt
View file

@ -374,8 +374,6 @@ if(ENABLE_QT6 AND Qt6_LOCATION)
list(APPEND CMAKE_PREFIX_PATH "${Qt6_LOCATION}") list(APPEND CMAKE_PREFIX_PATH "${Qt6_LOCATION}")
endif() endif()
# QT6 searches for Vulkan::Headers, too, so we have to define it before QT6 has a chance to do it.
add_subdirectory(externals)
function(set_suyu_qt_components) function(set_suyu_qt_components)
# Best practice is to ask for all components at once, so they are from the same version # Best practice is to ask for all components at once, so they are from the same version
@ -712,6 +710,7 @@ if (SUYU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif() endif()
endif() endif()
add_subdirectory(externals)
add_subdirectory(src) add_subdirectory(src)
# Set suyu project or suyu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not # Set suyu project or suyu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not