mirror of
https://github.com/HarbourMasters/2ship2harkinian.git
synced 2024-11-23 22:19:53 +00:00
Tweaks to CI (#95)
This commit is contained in:
parent
d15913bcbb
commit
240aa03456
17
.github/workflows/main.yml
vendored
17
.github/workflows/main.yml
vendored
@ -49,7 +49,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
url="${{ secrets.BASEROM }}"
|
url="${{ secrets.BASEROM }}"
|
||||||
outputPath="${{ github.workspace }}/OTRExporter/baserom.z64"
|
outputPath="${{ github.workspace }}/OTRExporter/baserom.z64"
|
||||||
wget "$url" -O "$outputPath"
|
wget "$url" -q -O "$outputPath"
|
||||||
- name: Generate soh.otr
|
- name: Generate soh.otr
|
||||||
run: |
|
run: |
|
||||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
||||||
@ -65,8 +65,6 @@ jobs:
|
|||||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
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 --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
|
||||||
cmake --build build-cmake --config Release --target ExtractAssetHeaders -j
|
cmake --build build-cmake --config Release --target ExtractAssetHeaders -j
|
||||||
|
|
||||||
find mm/assets/**/* -type f -exec touch -d "$(cat headers_updated_at.txt)" {} \;
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: headers
|
name: headers
|
||||||
@ -213,7 +211,6 @@ jobs:
|
|||||||
# name: 2ship-windows
|
# name: 2ship-windows
|
||||||
# path: 2ship-windows
|
# path: 2ship-windows
|
||||||
build-windows-self-hosted:
|
build-windows-self-hosted:
|
||||||
needs: generate-soh-otr-and-headers
|
|
||||||
runs-on: self-hosted
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
@ -237,21 +234,15 @@ jobs:
|
|||||||
vcpkg
|
vcpkg
|
||||||
- name: Configure Developer Command Prompt
|
- name: Configure Developer Command Prompt
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
uses: ilammy/msvc-dev-cmd@v1
|
||||||
- name: Download soh.otr
|
- name: Copy Rom
|
||||||
uses: actions/download-artifact@v4
|
run: Copy-Item -Path C:\baserom_mm.z64 -Destination ${{github.workspace}}/OTRExporter/baserom.z64
|
||||||
with:
|
|
||||||
name: soh.otr
|
|
||||||
- name: Download Headers
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: headers
|
|
||||||
path: mm/assets
|
|
||||||
- name: Build 2Ship
|
- name: Build 2Ship
|
||||||
env:
|
env:
|
||||||
VCPKG_ROOT: ${{github.workspace}}/vcpkg
|
VCPKG_ROOT: ${{github.workspace}}/vcpkg
|
||||||
run: |
|
run: |
|
||||||
set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
|
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 -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release
|
||||||
|
cmake --build build-windows --config Release --target ExtractAssetHeaders --parallel 10
|
||||||
cmake --build build-windows --config Release --parallel 10
|
cmake --build build-windows --config Release --parallel 10
|
||||||
|
|
||||||
# Not building releases/artifacts for now
|
# Not building releases/artifacts for now
|
||||||
|
@ -1 +0,0 @@
|
|||||||
2024-01-18 10:07:18
|
|
Loading…
Reference in New Issue
Block a user