diff --git a/.github/workflows/Linux_build.yml b/.github/workflows/Linux_build.yml index 3ca9226bb..bcf06a345 100644 --- a/.github/workflows/Linux_build.yml +++ b/.github/workflows/Linux_build.yml @@ -51,12 +51,11 @@ jobs: # run: ./xb lint --all build-linux: - name: Build (Linux, ${{ matrix.configuration }}, LLVM ${{ matrix.llvm_version }}) # runner.os can't be used here + name: Build (Linux, LLVM ${{ matrix.llvm_version }}) # runner.os can't be used here # needs: lint strategy: fail-fast: false matrix: - configuration: [Release, Debug] llvm_version: [15] #[15, 16, 17, 18, 19] runs-on: ubuntu-24.04 steps: @@ -79,4 +78,4 @@ jobs: sudo apt-get -y install mesa-vulkan-drivers valgrind libc++-dev libc++abi-dev libgtk-3-dev libsdl2-dev libvulkan-dev libx11-dev libx11-xcb-dev clang-$LLVM_VERSION clang-format-$LLVM_VERSION llvm-$LLVM_VERSION ./xb setup - name: Build - run: ./xb build --config=${{ matrix.configuration }} + run: ./xb build --config=Release diff --git a/.github/workflows/Windows_build.yml b/.github/workflows/Windows_build.yml index 26c65a05f..e13ee7bbf 100644 --- a/.github/workflows/Windows_build.yml +++ b/.github/workflows/Windows_build.yml @@ -59,13 +59,12 @@ jobs: run: .\xb lint --all build-windows: - name: Build (Windows, VS${{ matrix.vsver }}, ${{ matrix.configuration }}) # runner.os can't be used here + name: Build (Windows, VS${{ matrix.vsver }}) # runner.os can't be used here needs: lint strategy: fail-fast: false matrix: vsver: [2022] - configuration: [Release, Debug, Checked] runs-on: windows-${{ matrix.vsver }} env: POWERSHELL_TELEMETRY_OPTOUT: 1 @@ -78,11 +77,10 @@ jobs: - name: Build run: .\xb build --config=Release --target=src\xenia-app - name: Prepare artifacts - if: matrix.configuration == 'Release' id: prepare_artifacts run: | - robocopy . build\bin\${{ runner.os }}\Release LICENSE /r:0 /w:0 - robocopy build\bin\${{ runner.os }}\Release artifacts\xenia_canary xenia_canary.exe xenia_canary.pdb LICENSE /r:0 /w:0 + robocopy . build\bin\Windows\Release LICENSE /r:0 /w:0 + robocopy build\bin\Windows\Release artifacts\xenia_canary xenia_canary.exe xenia_canary.pdb LICENSE /r:0 /w:0 If ($LastExitCode -le 7) { echo "LastExitCode = $LastExitCode";$LastExitCode = 0 } - name: Upload xenia canary artifacts if: steps.prepare_artifacts.outcome == 'success' @@ -101,12 +99,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - # REMOVE THIS IF UNNEEDED v - if [ ${{ matrix.configuration }} != Release ]; then - echo "::error::Can only create release for Release build" - exit 1 - fi - # REMOVE THIS IF UNNEEDED ^ $asset="xenia_canary.zip" rm -recurse -force artifacts\xenia_canary\*.pdb # Ideally this would use xr, but I can't get it to work 7z a $asset .\artifacts\xenia_canary\*