Compare commits

...

5 Commits

Author SHA1 Message Date
Jermz 9867106d9f Merge branch 'dev' into 'dev'
Adding beggining of CI build

See merge request suyu-emu/suyu!69
2024-03-09 13:04:36 +00:00
Aaron Dewes d02af377d4 Use new Discord link 2024-03-09 12:58:11 +00:00
Amir Abravesh 7a33aedc57 Updating macOS icon to BigSur style icon 2024-03-09 07:34:32 +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
3 changed files with 72 additions and 4 deletions

View File

@ -1,6 +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
clang-format:
stage: format
@ -24,3 +43,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

@ -24,7 +24,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f
</h4>
<p align="center">
<a href="https://discord.gg/2gQRBp44KT">Discord</a> |
<a href="https://discord.gg/suyu">Discord</a> |
<a href="#status">Status</a> |
<a href="#development">Development</a> |
<a href="#downloads">Downloads</a> |
@ -36,7 +36,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f
## Status
Although we're able to make builds, we don't have a version ready for distribution yet. But we can always use more help! You can make a merge request if you'd like to see something changed, or you can [chat with other developers to find out what needs work](https://discord.gg/2gQRBp44KT).
Although we're able to make builds, we don't have a version ready for distribution yet. But we can always use more help! You can make a merge request if you'd like to see something changed, or you can [chat with other developers to find out what needs work](https://discord.gg/suyu).
**Note**: We try to update this README whenever we can, but some links might be broken, and some information may be outdated or irrelevant.
@ -44,7 +44,7 @@ Although we're able to make builds, we don't have a version ready for distributi
This project is completely free and open source, and anyone can contribute to help improve suyu.
Most of the development happens on GitLab. For development discussion, please join us on [Discord](https://discord.gg/2gQRBp44KT).
Most of the development happens on GitLab. For development discussion, please join us on [Discord](https://discord.gg/suyu).
If you want to contribute, please take a look at the [Contributor's Guide](https://gitlab.com/suyu-emu/suyu/-/wikis/Contributing) and [Developer Information](https://gitlab.com/suyu-emu/suyu/-/wikis/Developer-Information).
You can also contact any of the developers on Discord to learn more about the current state of suyu.
@ -65,7 +65,7 @@ We don't have any official builds yet! If any website or person is claiming to h
## Support
If you have any questions, don't hesitate to ask us on [Discord](https://discord.gg/2gQRBp44KT). We don't bite!
If you have any questions, don't hesitate to ask us on [Discord](https://discord.gg/suyu). We don't bite!
## License

BIN
dist/suyu.icns vendored

Binary file not shown.