-
Notifications
You must be signed in to change notification settings - Fork 65
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CI and various compile fixes #270
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4a06ab7
Fix emscripten build.
dsvensson 20c38ef
Fix mingw 32 bit build.
dsvensson 63426d4
Only try to static link ezhud if building client.
dsvensson 4e3149e
Make STRIPFLAGS overrideable.
dsvensson 66ac655
pkgconf typo, should be --atleast-version.
dsvensson 95a8947
Fix -host -> --host typo.
dsvensson a176c97
Update CI.
dsvensson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Get number of CPU cores | ||
| uses: SimenB/github-actions-cpu-cores@v1 | ||
| uses: SimenB/github-actions-cpu-cores@v2 | ||
| id: cpu-cores | ||
|
|
||
| - uses: actions/checkout@v4 | ||
|
|
@@ -49,50 +49,108 @@ jobs: | |
| run: | | ||
| cmake --build build_${{ matrix.profile }} --parallel ${{ steps.cpu-cores.outputs.count }} | ||
|
|
||
| wasm: | ||
| make: | ||
| strategy: | ||
| # Concurrent builds currently broken: | ||
| # https://github.com/mymindstorm/setup-emsdk/issues/20 | ||
| matrix: | ||
| emsdk: [ "2.0.12" ] #, "3.1.8", "3.1.51" ] | ||
| profile: [ "rel" ] #, "dbg" ] | ||
|
|
||
| runs-on: ubuntu-latest | ||
| include: | ||
| - name: web | ||
| fte_target: web | ||
| make_targets: "gl-rel" | ||
| os: ubuntu-latest | ||
| - name: linux64 | ||
| fte_target: linux64 | ||
| make_targets: "m-rel sv-rel qtv-rel qcc-rel" | ||
| os: ubuntu-latest | ||
| packages: "libasound2-dev libgl-dev libegl1-mesa-dev libwayland-dev libxcursor-dev libxi-dev libxkbcommon-dev libxrandr-dev libxss-dev" | ||
| - name: win32 | ||
| fte_target: win32 | ||
| make_targets: "m-rel sv-rel qcc-rel" | ||
| os: ubuntu-latest | ||
| packages: "binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686" | ||
| - name: win64 | ||
| fte_target: win64 | ||
| make_targets: "m-rel sv-rel qcc-rel" | ||
| os: ubuntu-latest | ||
| packages: "binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64" | ||
| - name: macos-arm64 | ||
| fte_target: SDL2 | ||
| make_targets: "gl-rel sv-rel qcc-rel" | ||
| args: "ARCH=arm STRIPFLAGS=" | ||
| packages: "sdl2" | ||
| os: macos-latest | ||
|
|
||
| name: make-${{ matrix.name }} | ||
| runs-on: ${{ matrix.os }} | ||
| timeout-minutes: 30 | ||
|
|
||
| steps: | ||
| - name: Get number of CPU cores | ||
| uses: SimenB/github-actions-cpu-cores@v1 | ||
| uses: SimenB/github-actions-cpu-cores@v2 | ||
| id: cpu-cores | ||
|
|
||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: mymindstorm/setup-emsdk@v13 | ||
| - name: Extract versions | ||
| run: grep 'VER=' engine/Makefile | tee makelibs_versions | ||
|
|
||
| - uses: actions/cache@v4 | ||
| id: cache | ||
| with: | ||
| path: engine/libs-* | ||
| key: ${{ runner.os }}-${{ matrix.fte_target }}-${{ hashFiles('makelibs_versions') }} | ||
|
|
||
| - uses: mymindstorm/setup-emsdk@v14 | ||
| with: | ||
| version: ${{ matrix.emsdk }} | ||
| actions-cache-folder: "emsdk-cache-${{ matrix.emsdk }}" | ||
| version: "2.0.12" | ||
| actions-cache-folder: "emsdk-cache-2.0.12" | ||
| cache-key: "emsdk-2.0.12" | ||
| if: matrix.fte_target == 'web' | ||
|
|
||
| - name: Verify emscripten | ||
| run: emcc -v | ||
| if: matrix.fte_target == 'web' | ||
|
|
||
| - name: Install dependencies (linux) | ||
| run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends ${{ matrix.packages }} | ||
| if: matrix.packages != '' && matrix.os == 'ubuntu-latest' | ||
|
|
||
| - name: Install dependencies (macos) | ||
| run: brew install ${{ matrix.packages }} | ||
| if: matrix.packages != '' && matrix.os == 'macos-latest' | ||
|
|
||
| - name: Build dependencies | ||
| working-directory: engine | ||
| run: | | ||
| make -j ${{ steps.cpu-cores.outputs.count }} makelibs FTE_TARGET=web | ||
| run: make FTE_TARGET=${{ matrix.fte_target }} makelibs ${{ matrix.args }} | ||
| if: steps.cache.outputs.cache-hit != 'true' | ||
|
|
||
| - name: Build wasm | ||
| - uses: ammaraskar/[email protected] | ||
|
|
||
| - name: Build ${{ matrix.name }} | ||
| working-directory: engine | ||
| run: | | ||
| # Currently fails to build | ||
| sed -r -i '/define Q3(CLIENT|SERVER)/d' common/config_fteqw.h | ||
| make -j ${{ steps.cpu-cores.outputs.count }} FTE_TARGET=${{ matrix.fte_target }} ${{ matrix.make_targets }} ${{ matrix.args }} LINK_EZHUD=1 LINK_OPENSSL=1 | ||
|
|
||
| make -j ${{ steps.cpu-cores.outputs.count }} FTE_TARGET=web web-${{ matrix.profile }} | ||
| - name: Attach macOS docs | ||
| run: | | ||
| cat <<EOF > engine/release/fte_macos.txt | ||
| To allow executables to run issue for example: | ||
| chmod +x fteqw-glsdl2 | ||
| xattr -d com.apple.quarantine fteqw-glsdl2 | ||
|
|
||
| If you don't have SDL2 installed, run: | ||
| brew install sdl2 | ||
| EOF | ||
| if: matrix.os == 'macos-latest' | ||
|
|
||
| - name: Get version | ||
| id: version | ||
| run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT | ||
|
|
||
| - name: Upload artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: fteqw-web-${{ matrix.profile }}-em${{ matrix.emsdk }} | ||
| name: fteqw-${{ matrix.name }}-${{ steps.version.outputs.short_sha }} | ||
| path: | | ||
| engine/*/ftewebgl.js | ||
| engine/*/ftewebgl.html | ||
| engine/*/ftewebgl.wasm | ||
| engine/release/fte* | ||
| !engine/release/*.db | ||
| compression-level: 9 | ||
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixes the win32 plugins build, same as the win64 case a few lines down. Think it's correct at least.