forked from HarbourMasters/Shipwright
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop-rando' into check-tracker-totals-devrando
- Loading branch information
Showing
102 changed files
with
1,217 additions
and
601 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ concurrency: | |
| cancel-in-progress: true | ||
| jobs: | ||
| generate-soh-otr: | ||
| runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }} | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
|
|
@@ -20,7 +20,6 @@ jobs: | |
| ${{ runner.os }}-otr-ccache-${{ github.ref }} | ||
| ${{ runner.os }}-otr-ccache- | ||
| - name: Install dependencies | ||
| if: ${{ !vars.LINUX_RUNNER }} | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) | ||
|
|
@@ -35,7 +34,6 @@ jobs: | |
| build-cmake | ||
| SDL2-2.28.5 | ||
| - name: Install latest SDL | ||
| if: ${{ !vars.LINUX_RUNNER }} | ||
| run: | | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| if [ ! -d "SDL2-2.28.5" ]; then | ||
|
|
@@ -73,47 +71,44 @@ jobs: | |
| retention-days: 1 | ||
| build-macos: | ||
| needs: generate-soh-otr | ||
| runs-on: ${{ (vars.MAC_RUNNER && fromJSON(vars.MAC_RUNNER)) || 'macos-12' }} | ||
| runs-on: macos-14 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
| - name: ccache | ||
| uses: hendrikmuhs/[email protected].11 | ||
| uses: hendrikmuhs/[email protected].13 | ||
| with: | ||
| key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }} | ||
| create-symlink: true | ||
| key: ${{ runner.os }}-14-ccache-${{ github.ref }}-${{ github.sha }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-ccache-${{ github.ref }} | ||
| ${{ runner.os }}-ccache- | ||
| ${{ runner.os }}-14-ccache-${{ github.ref }} | ||
| ${{ runner.os }}-14-ccache- | ||
| - name: Install gtar wrapper | ||
| if: ${{ !vars.MAC_RUNNER }} | ||
| run: | | ||
| sudo mv /usr/local/bin/gtar /usr/local/bin/gtar.orig | ||
| sudo cp .github/workflows//gtar /usr/local/bin/gtar | ||
| sudo chmod +x /usr/local/bin/gtar | ||
| sudo mv /opt/homebrew/bin/gtar /opt/homebrew/bin/gtar.orig | ||
| sudo cp .github/workflows//gtar /opt/homebrew/bin/gtar | ||
| sudo chmod +x /opt/homebrew/bin/gtar | ||
| - name: Cache MacPorts | ||
| id: cache-macports | ||
| if: ${{ !vars.MAC_RUNNER }} | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: /opt/local/ | ||
| key: ${{ runner.os }}-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }} | ||
| key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-macports- | ||
| ${{ runner.os }}-14-macports- | ||
| - name: Install MacPorts (if necessary) | ||
| if: ${{ !vars.MAC_RUNNER }} | ||
| run: | | ||
| if [ -d /opt/local/ ]; then | ||
| echo "MacPorts already installed" | ||
| else | ||
| wget https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3-12-Monterey.pkg | ||
| sudo installer -pkg ./MacPorts-2.9.3-12-Monterey.pkg -target / | ||
| wget https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3-14-Sonoma.pkg | ||
| sudo installer -pkg ./MacPorts-2.9.3-14-Sonoma.pkg -target / | ||
| fi | ||
| echo "/opt/local/bin:/opt/local/sbin" >> $GITHUB_PATH | ||
| - name: Install dependencies | ||
| if: ${{ !vars.MAC_RUNNER }} | ||
| run: | | ||
| brew uninstall --ignore-dependencies libpng libzip | ||
| brew uninstall --ignore-dependencies libpng | ||
| sudo port install $(cat .github/workflows/macports-deps.txt) | ||
| brew install ninja | ||
| - name: Download soh.otr | ||
|
|
@@ -122,7 +117,6 @@ jobs: | |
| name: soh.otr | ||
| - name: Build SoH | ||
| 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 -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_REMOTE_CONTROL=1 | ||
| cmake --build build-cmake --config Release --parallel 10 | ||
| mv soh.otr build-cmake/soh | ||
|
|
@@ -139,45 +133,33 @@ jobs: | |
| readme.txt | ||
| build-linux: | ||
| needs: generate-soh-otr | ||
| strategy: | ||
| fail-fast: true | ||
| matrix: | ||
| include: | ||
| - os: ubuntu-20.04 | ||
| gcc: 10 | ||
| archive-suffix: compatibility | ||
| - os: ubuntu-22.04 | ||
| gcc: 12 | ||
| archive-suffix: performance | ||
| runs-on: ${{ (matrix.os == 'ubuntu-20.04' && ((vars.LINUX_COMPATIBILITY_RUNNER && fromJSON(vars.LINUX_COMPATIBILITY_RUNNER)) || matrix.os)) || (matrix.os == 'ubuntu-22.04' && ((vars.LINUX_PERFORMANCE_RUNNER && fromJSON(vars.LINUX_PERFORMANCE_RUNNER)) || matrix.os)) }} | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
| - name: Install dependencies | ||
| if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }} | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) | ||
| - name: ccache | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| key: ${{ matrix.os }}-ccache-${{ github.ref }}-${{ github.sha }} | ||
| key: linux-ccache-${{ github.ref }}-${{ github.sha }} | ||
| restore-keys: | | ||
| ${{ matrix.os }}-ccache-${{ github.ref }} | ||
| ${{ matrix.os }}-ccache- | ||
| linux-ccache-${{ github.ref }} | ||
| linux-ccache- | ||
| - name: Cache build folders | ||
| uses: actions/cache@v4 | ||
| with: | ||
| key: ${{ matrix.os }}-build-${{ github.ref }}-${{ github.sha }} | ||
| key: linux-build-${{ github.ref }}-${{ github.sha }} | ||
| restore-keys: | | ||
| ${{ matrix.os }}-build-${{ github.ref }} | ||
| ${{ matrix.os }}-build- | ||
| linux-build-${{ github.ref }} | ||
| linux-build- | ||
| path: | | ||
| SDL2-2.28.5 | ||
| SDL2_net-2.2.0 | ||
| - name: Install latest SDL | ||
| if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }} | ||
| run: | | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| if [ ! -d "SDL2-2.28.5" ]; then | ||
|
|
@@ -189,38 +171,7 @@ jobs: | |
| make -j 10 | ||
| sudo make install | ||
| sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ | ||
| - name: Install latest libzip | ||
| if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) }} | ||
| run: | | ||
| sudo apt-get remove libzip-dev zipcmp zipmerge ziptool | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| if [ ! -d "libzip-1.10.1" ]; then | ||
| wget https://libzip.org/download/libzip-1.10.1.tar.gz | ||
| tar -xzvf libzip-1.10.1.tar.gz | ||
| fi | ||
| cd libzip-1.10.1 | ||
| mkdir build | ||
| cd build | ||
| cmake .. | ||
| make | ||
| sudo make install | ||
| - name: Install latest nlohmann | ||
| if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) }} | ||
| run: | | ||
| sudo apt-get remove nlohmann-json3-dev | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| if [ ! -d "json-3.11.3" ]; then | ||
| wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz | ||
| tar -xzvf v3.11.3.tar.gz | ||
| fi | ||
| cd json-3.11.3 | ||
| mkdir build | ||
| cd build | ||
| cmake .. | ||
| make | ||
| sudo make install | ||
| - name: Install latest tinyxml2 | ||
| if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }} | ||
| run: | | ||
| sudo apt-get remove libtinyxml2-dev | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
|
|
@@ -235,7 +186,6 @@ jobs: | |
| make | ||
| sudo make install | ||
| - name: Install latest SDL_net | ||
| if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }} | ||
| run: | | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| if [ ! -d "SDL2_net-2.2.0" ]; then | ||
|
|
@@ -261,12 +211,12 @@ jobs: | |
| mv README.md readme.txt | ||
| mv build-cmake/*.appimage soh.appimage | ||
| env: | ||
| CC: gcc-${{ matrix.gcc }} | ||
| CXX: g++-${{ matrix.gcc }} | ||
| CC: gcc-12 | ||
| CXX: g++-12 | ||
| - name: Upload build | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: soh-linux-${{ matrix.archive-suffix }} | ||
| name: soh-linux | ||
| path: | | ||
| soh.appimage | ||
| readme.txt | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| #!/bin/sh | ||
| exec sudo /usr/local/bin/gtar.orig "$@" | ||
| exec sudo /opt/homebrew/bin/gtar.orig "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule OTRExporter
updated
4 files
| +1 −1 | OTRExporter/ArrayExporter.cpp | |
| +3 −1 | OTRExporter/CMakeLists.txt | |
| +1 −1 | OTRExporter/DisplayListExporter.cpp | |
| +1 −1 | OTRExporter/VersionInfo.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule libultraship
updated
79 files
Oops, something went wrong.