Skip to content

Commit 2269f9e

Browse files
authored
Add Arm64 build (#6)
* Add Arm64 build * Don't use container * Fix console build
1 parent a8756bd commit 2269f9e

File tree

6 files changed

+27
-3
lines changed

6 files changed

+27
-3
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@ jobs:
2323
name: Linux
2424
path: build/allOutputs
2525

26+
build-linux-arm64:
27+
name: "Build - Linux Arm64"
28+
runs-on: ubuntu-24.04-arm
29+
steps:
30+
- uses: actions/checkout@v4
31+
with:
32+
submodules: true
33+
34+
- name: Setup Dependencies
35+
run: sudo apt-get update && sudo apt-get install -y ninja-build libusb-1.0-0-dev libudev-dev
36+
37+
- name: Build
38+
run: ./gradlew build
39+
40+
- uses: actions/upload-artifact@v4
41+
with:
42+
name: LinuxArm64
43+
path: build/allOutputs
44+
2645
# build-linux-arm64:
2746
# name: "Build - Linux Arm64"
2847
# runs-on: ubuntu-latest
@@ -111,7 +130,7 @@ jobs:
111130

112131
nuget:
113132
name: NuGet Package
114-
needs: [ build-linux, build-windows, build-macos ]
133+
needs: [ build-linux, build-linux-arm64, build-windows, build-macos ]
115134
runs-on: ubuntu-latest
116135
steps:
117136
- uses: actions/checkout@v4
@@ -145,7 +164,7 @@ jobs:
145164

146165
combine:
147166
name: Combine
148-
needs: [ build-linux, build-windows, build-macos ]
167+
needs: [ build-linux, build-linux-arm64, build-windows, build-macos ]
149168
runs-on: ubuntu-latest
150169
steps:
151170
- uses: actions/checkout@v4

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// Project Version
9-
ext.pub_version = "3.2.26-2"
9+
ext.pub_version = "3.2.26-3"
1010

1111
static def get_platform() {
1212
def platform

libsdl.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ types.each { type ->
5858
args "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded${crtType}DLL"
5959
}
6060

61+
args "-DSDL_UNIX_CONSOLE_BUILD=ON"
6162
args "-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=${buildDir}/lib"
6263
args "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${buildDir}/lib"
6364
args "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${buildDir}/lib"

nuget/WPILib.DriverStation.SDL.runtime/WPILib.DriverStation.SDL.runtime.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<None Include="runtimes\win-x64\native\SDL3.dll" Pack="true" PackagePath="runtimes\win-x64\native" />
2222
<None Include="runtimes\win-arm64\native\SDL3.dll" Pack="true" PackagePath="runtimes\win-arm64\native" />
2323
<None Include="runtimes\linux-x64\native\libSDL3.so" Pack="true" PackagePath="runtimes\linux-x64\native" />
24+
<None Include="runtimes\linux-arm64\native\libSDL3.so" Pack="true" PackagePath="runtimes\linux-arm64\native" />
2425
<None Include="runtimes\osx-x64\native\libSDL3.dylib" Pack="true" PackagePath="runtimes\osx-x64\native" />
2526
<None Include="runtimes\osx-arm64\native\libSDL3.dylib" Pack="true" PackagePath="runtimes\osx-arm64\native" />
2627
</ItemGroup>

nuget/WPILib.DriverStation.SDL.staticruntime/WPILib.DriverStation.SDL.staticruntime.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<None Include="runtimes\win-x64\SDL3-static.pdb" Pack="true" PackagePath="static\win-x64" />
2424
<None Include="runtimes\win-arm64\SDL3-static.pdb" Pack="true" PackagePath="static\win-arm64" />
2525
<None Include="runtimes\linux-x64\libSDL3.a" Pack="true" PackagePath="static\linux-x64" />
26+
<None Include="runtimes\linux-arm64\libSDL3.a" Pack="true" PackagePath="static\linux-arm64" />
2627
<None Include="runtimes\osx-x64\libSDL3.a" Pack="true" PackagePath="static\osx-x64" />
2728
<None Include="runtimes\osx-arm64\libSDL3.a" Pack="true" PackagePath="static\osx-arm64" />
2829
</ItemGroup>

nuget/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def artifactMap = [
7676
"${buildDir}/unzipped/shared/windows/arm64/shared/SDL3.dll": "runtimes/win-arm64/native",
7777
"${buildDir}/unzipped/shared/osx/universal/shared/libSDL3.dylib": "runtimes/osx-arm64/native",
7878
"${buildDir}/unzipped/shared/linux/x86-64/shared/libSDL3.so": "runtimes/linux-x64/native",
79+
"${buildDir}/unzipped/shared/linux/arm64/shared/libSDL3.so": "runtimes/linux-arm64/native",
7980
]
8081

8182
def staticArtifactMap = [
@@ -85,6 +86,7 @@ def staticArtifactMap = [
8586
"${buildDir}/unzipped/static/windows/arm64/static/SDL3-static.pdb": "runtimes/win-arm64",
8687
"${buildDir}/unzipped/static/osx/universal/static/libSDL3.a": "runtimes/osx-arm64",
8788
"${buildDir}/unzipped/static/linux/x86-64/static/libSDL3.a": "runtimes/linux-x64",
89+
"${buildDir}/unzipped/static/linux/arm64/static/libSDL3.a": "runtimes/linux-arm64",
8890
]
8991

9092
task copyArtifacts(type: Copy) {

0 commit comments

Comments
 (0)