mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-06-11 21:19:23 -04:00
Fix switch and windows CI (#700)
* merge upstream commit to fix some bug * fix merge * add a local user for the merge * Update main.yml * revert main.yml * fix windows CI * fix switch build * fix windows and try a fix for switch * fix windows build
This commit is contained in:
@@ -59,18 +59,18 @@ jobs:
|
||||
submodules: recursive
|
||||
- name: Build
|
||||
run: |
|
||||
cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A ${{ matrix.arch }} -DCMAKE_BUILD_TYPE=${{ matrix.config }}
|
||||
cmake --build ./build/x64 --config ${{ matrix.config }} --parallel 10
|
||||
cmake -S . -B "build/${{ matrix.arch }}" -G "Visual Studio 17 2022" -T v143 -A ${{ matrix.arch }} -DCMAKE_BUILD_TYPE=${{ matrix.config }}
|
||||
cmake --build ./build/${{ matrix.arch }} --config ${{ matrix.config }} --parallel 10
|
||||
- name: Download spaghetti.o2r
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: spaghetti.o2r
|
||||
path: ./build/x64/${{ matrix.config }}
|
||||
path: ./build/${{ matrix.arch }}/${{ matrix.config }}
|
||||
- name: Create Package
|
||||
run: |
|
||||
mkdir spaghetti-${{ matrix.config }}
|
||||
mv build/x64/${{ matrix.config }}/Spaghettify.exe spaghetti-${{ matrix.config }}/
|
||||
mv build/x64/${{ matrix.config }}/spaghetti.o2r spaghetti-${{ matrix.config }}/
|
||||
mv build/${{ matrix.arch }}/${{ matrix.config }}/Spaghettify.exe spaghetti-${{ matrix.config }}/
|
||||
mv build/${{ matrix.arch }}/${{ matrix.config }}/spaghetti.o2r spaghetti-${{ matrix.config }}/
|
||||
mv config.yml spaghetti-${{ matrix.config }}/
|
||||
mv yamls spaghetti-${{ matrix.config }}/
|
||||
mv meta spaghetti-${{ matrix.config }}/
|
||||
@@ -79,8 +79,8 @@ jobs:
|
||||
if: matrix.config == 'Release'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: spaghetti-windows
|
||||
path: spaghetti-${{ matrix.arch }}-${{ matrix.config }}
|
||||
name: spaghetti-windows-${{ matrix.arch }}
|
||||
path: spaghetti-${{ matrix.config }}
|
||||
|
||||
build-macos-arm64:
|
||||
needs: generate-port-o2r
|
||||
|
||||
Reference in New Issue
Block a user