Skip to content

Commit c4101b3

Browse files
authored
Update build.yml
1 parent cf2ac15 commit c4101b3

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,25 @@ jobs:
2323
run: |
2424
sudo dpkg --add-architecture i386
2525
sudo apt-get update
26-
sudo apt-get install -y build-essential gcc-multilib g++-multilib \
26+
sudo apt-get install -y \
27+
build-essential gcc-multilib g++-multilib \
2728
libsdl2-dev:i386
2829
29-
- name: Compile (x86_64)
30-
if: matrix.arch == 'x86_64'
31-
run: make release -j$(nproc) -C engine
32-
env:
33-
ARCHIVE: 1
30+
- name: Clean
31+
run: make clean -C engine || true
3432

35-
- name: Compile (i386)
36-
if: matrix.arch == 'i386'
33+
- name: Compile
3734
run: make release -j$(nproc) -C engine
3835
env:
3936
ARCHIVE: 1
40-
CFLAGS: -m32
41-
CXXFLAGS: -m32
42-
LDFLAGS: -m32
37+
TERM: xterm
38+
CFLAGS: ${{ matrix.arch == 'i386' && '-m32' || '-m64' }}
39+
CXXFLAGS: ${{ matrix.arch == 'i386' && '-m32' || '-m64' }}
40+
LDFLAGS: ${{ matrix.arch == 'i386' && '-m32' || '-m64' }}
41+
42+
- name: Verify architecture
43+
run: |
44+
file engine/build/release-*/q3rally* || true
4345
4446
- uses: actions/upload-artifact@v4
4547
with:
@@ -63,6 +65,11 @@ jobs:
6365
run: |
6466
choco install -y zip make mingw
6567
68+
- name: Clean
69+
run: |
70+
make clean -C engine 2>$null
71+
if ($LASTEXITCODE -ne 0) { exit 0 }
72+
6673
- name: Compile (x86_64)
6774
if: matrix.arch == 'x86_64'
6875
run: |
@@ -74,11 +81,9 @@ jobs:
7481
- name: Compile (i686 / 32-bit)
7582
if: matrix.arch == 'i686'
7683
run: |
77-
# Ensure MinGW is on PATH (Chocolatey mingw provides both 32/64; we force 32-bit toolchain)
7884
$mingw = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin"
7985
echo $mingw | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
8086
81-
# Force 32-bit compiler + flags; adjust variables if your Makefile uses different ones
8287
make release -j $env:NUMBER_OF_PROCESSORS -C engine USE_CURL_DLOPEN=1 `
8388
CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ `
8489
CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32"
@@ -105,24 +110,29 @@ jobs:
105110
path: engine/build/*.zip
106111

107112
web:
113+
name: Web
108114
runs-on: ubuntu-latest
109115
steps:
110116
- uses: actions/checkout@v4
117+
111118
- uses: actions/checkout@v4
112119
with:
113120
repository: emscripten-core/emsdk
114121
path: emsdk
122+
115123
- name: Install Dependencies
116124
run: |
117125
cd emsdk
118126
./emsdk install 3.1.58
119127
./emsdk activate 3.1.58
128+
120129
- name: Compile
121130
env:
122131
ARCHIVE: 1
123132
run: |
124133
source emsdk/emsdk_env.sh
125134
emmake make release -j$(nproc) -C engine
135+
126136
- uses: actions/upload-artifact@v4
127137
with:
128138
name: Web

0 commit comments

Comments
 (0)