windows actions (again) (#39)
Some checks failed
eden-build / source (push) Successful in 7m51s
eden-build / linux (push) Failing after 22m54s
eden-build / android (push) Failing after 33m53s
eden-build / windows (msvc) (push) Successful in 1h0m50s

Reviewed-on: #39
Co-authored-by: swurl <swurl@swurl.xyz>
Co-committed-by: swurl <swurl@swurl.xyz>
This commit is contained in:
swurl 2025-04-17 04:50:25 +00:00 committed by crueter
parent be1c1e4a48
commit 8fab729744
3 changed files with 25 additions and 16 deletions

View file

@ -4,9 +4,9 @@ name: eden-build
on: on:
push: push:
branches: [ "*" ] branches: [ "master" ]
tags: [ "*" ] tags: [ "*" ]
pull_request_target: pull_request:
branches: [ master ] branches: [ master ]
jobs: jobs:
@ -25,7 +25,7 @@ jobs:
name: source.zip name: source.zip
path: artifacts/ path: artifacts/
windows: windows:
runs-on: windows-latest runs-on: windows
strategy: strategy:
matrix: matrix:
target: ["msvc"] # TODO: Add msys2 target: ["msvc"] # TODO: Add msys2
@ -42,8 +42,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
fetch-depth: 1 fetch-depth: 0
fetch-tags: true
- name: Set up vcpkg cache - name: Set up vcpkg cache
uses: actions/cache@v4 uses: actions/cache@v4
@ -57,21 +56,24 @@ jobs:
${{ runner.os }}-${{ matrix.target }}-vcpkg- ${{ runner.os }}-${{ matrix.target }}-vcpkg-
- name: Set up MSVC - name: Set up MSVC
uses: ilammy/msvc-dev-cmd@v1 uses: https://github.com/ilammy/msvc-dev-cmd@v1
if: ${{ matrix.target == 'msvc' }} if: ${{ matrix.target == 'msvc' }}
- name: Install extra tools
run: choco install ccache ninja wget cygwin # - name: Install extra tools
if: ${{ matrix.target == 'msvc' }} # run: choco install ccache ninja wget cygwin
- name: Install vulkan-SDK # if: ${{ matrix.target == 'msvc' }}
run: ./.ci/install-vulkan-sdk.ps1
shell: pwsh # - name: Install vulkan-SDK
# run: ./.ci/install-vulkan-sdk.ps1
# shell: powershell
- name: Cygwin with autoconf # NEEDED FOR LIBUSB - name: Cygwin with autoconf # NEEDED FOR LIBUSB
shell: cmd shell: cmd
run: | run: |
C:\tools\cygwin\cygwinsetup.exe -q -P autoconf,automake,libtool,make,pkg-config C:\tools\cygwin\cygwinsetup.exe -q -P autoconf,automake,libtool,make,pkg-config
REM Create wrapper batch files for Cygwin tools in a directory that will be in PATH REM Create wrapper batch files for Cygwin tools in a directory that will be in PATH
mkdir C:\cygwin-wrappers REM mkdir C:\cygwin-wrappers
REM Create autoconf.bat wrapper REM Create autoconf.bat wrapper
echo @echo off > C:\cygwin-wrappers\autoconf.bat echo @echo off > C:\cygwin-wrappers\autoconf.bat
@ -84,6 +86,7 @@ jobs:
REM Add the wrappers directory to PATH REM Add the wrappers directory to PATH
echo C:\cygwin-wrappers>>"%GITHUB_PATH%" echo C:\cygwin-wrappers>>"%GITHUB_PATH%"
echo C:\tools\cygwin\bin>>"%GITHUB_PATH%" echo C:\tools\cygwin\bin>>"%GITHUB_PATH%"
- name: CMake Configure - name: CMake Configure
id: cmake id: cmake
shell: cmd shell: cmd
@ -91,16 +94,18 @@ jobs:
mkdir build mkdir build
cd build cd build
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_TOOLCHAIN_FILE="%CD%\..\CMakeModules\MSVCCache.cmake" -DYUZU_USE_BUNDLED_QT=ON -DENABLE_QT_TRANSLATION=ON -DUSE_DISCORD_PRESENCE=ON -DYUZU_USE_BUNDLED_VCPKG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DUSE_CCACHE=ON cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_TOOLCHAIN_FILE="%CD%\..\CMakeModules\MSVCCache.cmake" -DYUZU_USE_BUNDLED_QT=ON -DENABLE_QT_TRANSLATION=ON -DUSE_DISCORD_PRESENCE=ON -DYUZU_USE_BUNDLED_VCPKG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DUSE_CCACHE=ON
- name: Build - name: Build
id: build id: build
shell: cmd shell: cmd
run: | run: |
cd build cd build
ninja yuzu yuzu-cmd yuzu-room tests -j4 ninja yuzu yuzu-cmd yuzu-room tests
ccache -s -v ccache -s -v
- name: Package artifacts - name: Package artifacts
if: steps.build.outcome == 'success' if: steps.build.outcome == 'success'
shell: pwsh shell: powershell
run: | run: |
$GITDATE = $(git show -s --date=short --format='%ad') -replace "-", "" $GITDATE = $(git show -s --date=short --format='%ad') -replace "-", ""
$GITREV = $(git show -s --format='%h') $GITREV = $(git show -s --format='%h')
@ -137,6 +142,7 @@ jobs:
Copy-Item "LICENSE*" -Destination "$RELEASE_DIST" -ErrorAction SilentlyContinue Copy-Item "LICENSE*" -Destination "$RELEASE_DIST" -ErrorAction SilentlyContinue
Copy-Item "README*" -Destination "$RELEASE_DIST" -ErrorAction SilentlyContinue Copy-Item "README*" -Destination "$RELEASE_DIST" -ErrorAction SilentlyContinue
- name: Upload Windows artifacts - name: Upload Windows artifacts
if: steps.build.outcome == 'success' if: steps.build.outcome == 'success'
uses: forgejo/upload-artifact@v4 uses: forgejo/upload-artifact@v4

View file

@ -11,9 +11,12 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Fetch master branch - name: Fetch master branch
run: git fetch origin master:master run: git fetch origin master:master
- name: Make script executable - name: Make script executable
run: chmod +x ./.ci/license-header.rb run: chmod +x ./.ci/license-header.rb
- name: Check license headers - name: Check license headers
run: ./.ci/license-header.rb run: ./.ci/license-header.rb

View file

@ -106,7 +106,7 @@ std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,
out_control = nacp.GetRawBytes(); out_control = nacp.GetRawBytes();
} else { } else {
out_control.resize(sizeof(FileSys::RawNACP)); out_control.resize(sizeof(FileSys::RawNACP));
std::fill(out_control.begin(), out_control.end(), 0); std::fill(out_control.begin(), out_control.end(), (u8) 0);
} }
auto& storage = system.GetContentProviderUnion(); auto& storage = system.GetContentProviderUnion();