Compare commits

...

6 Commits

Author SHA1 Message Date
Jermz 82fc4ddacc Merge branch 'dev' into 'dev'
Adding beggining of CI build

See merge request suyu-emu/suyu!69
2024-03-08 05:02:31 +00:00
cass_058 faf840f7d5 Disable compiling telemetry code by default 2024-03-08 05:00:53 +00:00
zqpvr 5db58434e5 Update settings.cpp 2024-03-08 00:40:12 +00:00
zqpvr 664e77b4d8 Update configure.ui 2024-03-08 00:23:54 +00:00
Jamie d95ca08f68 Merge remote-tracking branch 'upstream/dev' into dev
fixing merge issues & rebasing upstream onto dev
2024-03-07 12:48:27 -05:00
Jamie 4593234f30 Adding beggining of CI build
Needed for #8
2024-03-06 22:24:50 -05:00
4 changed files with 72 additions and 3 deletions

View File

@ -1,5 +1,25 @@
variables:
PR_NUMBER: "pr$CI_MERGE_REQUEST_IID"
stages:
- format
- build
- build-mac
- build-msvc
- android
format:
stage: format
image: ubuntu:latest
before_script:
- echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main" >> /etc/apt/sources.list
- apt-get update
- apt-get -y install git clang-format-15 clang-15 sdkmanager android-sdk bash openjdk-21-jdk openjdk-21-jre && clang-format-15 --version
- export ANDROID_HOME="/usr/lib/android-sdk/"
- echo y | sdkmanager --sdk_root=/usr/lib/android-sdk --licenses
script:
- bash -ex ./.ci/scripts/format/script.sh
build-linux:
stage: build
@ -17,3 +37,52 @@ build-linux:
artifacts:
paths:
- artifacts/*
build-mac:
stage: build-mac
image: ubuntu:latest
script:
- apt-get update -y
- apt-get install -y autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja-build nlohmann-json openssl pkg-config qt5-default libsdl2-dev speex zlib1g-dev zlib zstd
- mkdir build
- cd build
- export Qt5_DIR="/usr/local/Qt-5.x/lib/cmake"
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DYUZU_USE_BUNDLED_VCPKG=OFF -DYUZU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
- ninja
artifacts:
name: "macos"
paths:
- build/
build-msvc:
stage: build-msvc
image: mcr.microsoft.com/windows/servercore:ltsc2019
script:
- Invoke-WebRequest -Uri "https://github.com/mbitsnbites/buildcache/releases/download/v0.28.4/buildcache-windows.zip" -OutFile "buildcache-windows.zip"
- Expand-Archive -Path "buildcache-windows.zip" -DestinationPath "C:\buildcache"
- echo "C:\buildcache\bin" | Out-File -FilePath $env:Path -Encoding utf8 -Append
- .\.ci\scripts\windows\install-vulkan-sdk.ps1
- .\CMakeModules\MSVCCache.cmake
- glslangValidator --version
- mkdir build
- cd build
- cmake .. -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DYUZU_CRASH_DUMPS=ON
- cmake --build .
artifacts:
name: "msvc"
paths:
- build/
android:
stage: android
image: openjdk:17
script:
- apt-get update -y
- apt-get install -y ccache apksigner glslang-dev glslang-tools
- bash -c "export PR_NUMBER=$PR_NUMBER; ./.ci/scripts/android/build.sh"
artifacts:
name: "android"
paths:
- artifacts/

View File

@ -30,7 +30,7 @@ set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries
option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" OFF)
option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")

View File

@ -114,7 +114,7 @@ void LogSettings() {
LOG_INFO(Config, "{}: {}", name, Common::FS::PathToUTF8String(path));
};
LOG_INFO(Config, "yuzu Configuration:");
LOG_INFO(Config, "suyu Configuration:");
for (auto& [category, settings] : values.linkage.by_category) {
for (const auto& setting : settings) {
if (setting->Id() == values.yuzu_token.Id()) {

View File

@ -17,7 +17,7 @@
</size>
</property>
<property name="windowTitle">
<string>yuzu Configuration</string>
<string>suyu Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>