Replace some remaining soh branding with 2ship (#341)

This commit is contained in:
Garrett Cox
2024-05-22 09:05:04 -05:00
parent 9554f79e26
commit 7bc6c58721
8 changed files with 36 additions and 35 deletions
+5 -5
View File
@@ -34,7 +34,7 @@ jobs:
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build build-cmake --config Release --target GenerateSohOtr -j
cmake --build build-cmake --config Release --target Generate2ShipOtr -j
cmake --build build-cmake --config Release -j
(cd build-cmake && cpack -G External)
@@ -79,10 +79,10 @@ jobs:
# vcpkg
# - name: Configure Developer Command Prompt
# uses: ilammy/msvc-dev-cmd@v1
# - name: Download soh.otr
# - name: Download 2ship.otr
# uses: actions/download-artifact@v4
# with:
# name: soh.otr
# name: 2ship.otr
# - name: Download Headers
# uses: actions/download-artifact@v4
# with:
@@ -105,7 +105,7 @@ jobs:
# mv ./README.md ./2ship-windows/readme.txt
# mv ./build-windows/gamecontrollerdb.txt ./2ship-windows/gamecontrollerdb.txt
# mv ./x64/Release/assets ./2ship-windows
# mv ./soh.otr ./2ship-windows/soh.otr
# mv ./2ship.otr ./2ship-windows/2ship.otr
# - name: Upload build
# uses: actions/upload-artifact@v4
# with:
@@ -143,7 +143,7 @@ jobs:
run: |
set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build build-windows --config Release --target GenerateSohOtr --parallel 10
cmake --build build-windows --config Release --target Generate2ShipOtr --parallel 10
cmake --build build-windows --config Release --parallel 10
(cd build-windows && cpack)