Skip to content

Commit 2bcc68c

Browse files
authored
Merge pull request #181 from q4a/arm-ci
CI: add arm64 Linux build
2 parents 3409054 + 4e1e34a commit 2bcc68c

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

.github/workflows/linux_build.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
env: [
21-
{name: "Release", build_type: Release, arch: x86_64, upload: true, cmake: ""},
22-
{name: "Debug", build_type: Debug, arch: x86_64, upload: true, cmake: ""},
23-
{name: "Debug D3D9 + Sokol + Asserts", build_type: Debug, arch: x86_64, upload: false, cmake: "-DOPTION_D3D9=ON -DOPTION_SOKOL=ON -DOPTION_DEBUG_ASSERT=ON"},
24-
{name: "Release D3D9 + Sokol", build_type: Release, arch: x86_64, upload: false, cmake: "-DOPTION_D3D9=ON -DOPTION_SOKOL=ON"},
25-
{name: "Debug D3D9", build_type: Debug, arch: x86_64, upload: false, cmake: "-DOPTION_D3D9=ON -DOPTION_SOKOL=OFF"},
26-
{name: "Debug Sokol", build_type: Debug, arch: x86_64, upload: false, cmake: "-DOPTION_D3D9=OFF -DOPTION_SOKOL=ON"},
27-
{name: "Scripts Check", build_type: Release, arch: x86_64, upload: false, cmake: "-DOPTION_CHECK_SCRIPTS=ON "},
21+
{name: "Release", build_type: Release, arch: x86_64, os: ubuntu-latest, upload: true, cmake: ""},
22+
{name: "Release", build_type: Release, arch: arm64, os: ubuntu-24.04-arm, upload: true, cmake: ""},
23+
{name: "Debug", build_type: Debug, arch: x86_64, os: ubuntu-latest, upload: true, cmake: ""},
24+
{name: "Debug D3D9 + Sokol + Asserts", build_type: Debug, arch: x86_64, os: ubuntu-latest, upload: false, cmake: "-DOPTION_D3D9=ON -DOPTION_SOKOL=ON -DOPTION_DEBUG_ASSERT=ON"},
25+
{name: "Release D3D9 + Sokol", build_type: Release, arch: x86_64, os: ubuntu-latest, upload: false, cmake: "-DOPTION_D3D9=ON -DOPTION_SOKOL=ON"},
26+
{name: "Debug D3D9", build_type: Debug, arch: x86_64, os: ubuntu-latest, upload: false, cmake: "-DOPTION_D3D9=ON -DOPTION_SOKOL=OFF"},
27+
{name: "Debug Sokol", build_type: Debug, arch: x86_64, os: ubuntu-latest, upload: false, cmake: "-DOPTION_D3D9=OFF -DOPTION_SOKOL=ON"},
28+
{name: "Scripts Check", build_type: Release, arch: x86_64, os: ubuntu-latest, upload: false, cmake: "-DOPTION_CHECK_SCRIPTS=ON "},
2829
]
2930
name: ${{matrix.env.name}} ${{matrix.env.arch}}
3031
if: github.event.pull_request.draft != true
31-
runs-on: ubuntu-latest
32+
runs-on: ${{matrix.env.os}}
3233
container:
3334
image: "debian:buster"
3435
steps:

docker/linux/builder

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ BUILD_DIR=$WORK_DIR/build/docker-linux
1212
#Replace system SDL2 with ours
1313
if [[ -d "$LIBS_ROOT/sdl" ]]; then
1414
cp -va $LIBS_ROOT/sdl/include/* /usr/include/
15-
cp -va $LIBS_ROOT/sdl/lib/* /usr/lib/x86_64-linux-gnu/
15+
SYSTEM_ARCH=$(uname -m)
16+
if [[ $SYSTEM_ARCH = "aarch64" ]]; then
17+
cp -va $LIBS_ROOT/sdl/lib/* /usr/lib/aarch64-linux-gnu/
18+
else
19+
cp -va $LIBS_ROOT/sdl/lib/* /usr/lib/x86_64-linux-gnu/
20+
fi
1621
fi
1722

1823
#rm -rf $BUILD_DIR

0 commit comments

Comments
 (0)