diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 2fc432a523..6cb6d46f7d 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -57,26 +57,31 @@ jobs: mkdir ninja mv ninja.exe ninja/ - - name: Setup Environment + - name: Setup Environment and Scripts run: | - # Create a setup script to add tools to PATH in Wine - echo "@echo off" > setup_env.bat - echo "set PATH=Z:\home\runner\work\eden\eden\tools\llvm\bin;Z:\home\runner\work\eden\eden\tools\cmake\bin;Z:\home\runner\work\eden\eden\tools\ninja;%PATH%" >> setup_env.bat - echo "set CC=clang" >> setup_env.bat - echo "set CXX=clang++" >> setup_env.bat + # Create configure script + echo "@echo off" > configure.bat + echo "set PATH=tools\llvm\bin;tools\cmake\bin;tools\ninja;%PATH%" >> configure.bat + echo "set CC=clang" >> configure.bat + echo "set CXX=clang++" >> configure.bat + echo "cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_OPENSSL=ON -DYUZU_USE_BUNDLED_FFMPEG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DYUZU_USE_BUNDLED_QT=ON -DYUZU_USE_CPM=ON" >> configure.bat + + # Create build script + echo "@echo off" > build_eden.bat + echo "set PATH=tools\llvm\bin;tools\cmake\bin;tools\ninja;%PATH%" >> build_eden.bat + echo "cmake --build build --config Release" >> build_eden.bat - name: Configure (Wine Native) env: DISPLAY: :99 run: | - # We run cmake as if we are on Windows - wine cmd /c "setup_env.bat && cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_OPENSSL=ON -DYUZU_USE_BUNDLED_FFMPEG=ON -DYUZU_USE_BUNDLED_SDL2=ON -DYUZU_USE_BUNDLED_QT=ON -DYUZU_USE_CPM=ON" + wine cmd /c configure.bat - name: Build (Wine Native) env: DISPLAY: :99 run: | - wine cmd /c "setup_env.bat && cmake --build build --config Release" + wine cmd /c build_eden.bat - name: Prepare artifacts run: |