Skip to content

Commit c5c41cf

Browse files
authored
Add Linux arm64 support (#1335)
* Add Linux arm64 (aarch64) * Build linux arm64 in Jenkins
1 parent a69d9c8 commit c5c41cf

3 files changed

Lines changed: 18 additions & 9 deletions

File tree

CI/packagescripts/linux/packageLinux.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,24 @@ cleanup() {
220220

221221
}
222222

223-
for CPUTYPE in x64 armv7l ; do
223+
for CPUTYPE in x64 armv7l arm64 ; do
224224

225225
RIDEDIR="_/${BUILDNAME}/${APP_NAME}-linux-${CPUTYPE}"
226226

227-
if [ "${CPUTYPE}" = "x64" ] ; then
228-
DEBCPUTYPE="amd64"
229-
RPMCPUTYPE="x86_64"
230-
elif [ "${CPUTYPE}" = "armv7l" ] ; then
231-
DEBCPUTYPE="armhf"
232-
RPMCPUTYPE="armhf"
233-
fi
227+
case ${CPUTYPE} in
228+
"x64")
229+
DEBCPUTYPE="amd64"
230+
RPMCPUTYPE="x86_64"
231+
;;
232+
"armv7l")
233+
DEBCPUTYPE="armhf"
234+
RPMCPUTYPE="armhf"
235+
;;
236+
"arm64")
237+
DEBCPUTYPE="aarch64"
238+
RPMCPUTYPE="aarch64"
239+
;;
240+
esac
234241

235242
checkEnvironment
236243
getVersionInfo

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pipeline {
1616
checkout scm
1717
sh 'rm -Rf _ ship'
1818
sh 'npm i'
19-
sh 'npm run build l a w'
19+
sh 'npm run build l a w la'
2020
sh './CI/publish.sh'
2121
stash name: 'ride-win', includes: '_/ride*/Ride-*-win32-ia32/**'
2222
stash name: 'ride-linux', includes: '_/ride*/Ride-*-linux*/**'

mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ const pkg = (x, y, f) => {
8989
};
9090

9191
const l = (f) => { b(e => (e ? f(e) : pkg('linux', 'x64', f))); };
92+
const la= (f) => { b(e => (e ? f(e) : pkg('linux', 'arm64', f))); };
9293
const w = (f) => { b(e => (e ? f(e) : pkg('win32', 'ia32', f))); };
9394
const o = (f) => { b(e => (e ? f(e) : pkg('darwin', 'x64', f))); };
9495
const oa= (f) => { b(e => (e ? f(e) : pkg('darwin', 'arm64', f))); };
@@ -101,6 +102,7 @@ const c = (f) => { rm('_'); rm('/tmp/ridebuild'); f(); };
101102

102103
tasks.b = b; tasks.build = b;
103104
tasks.l = l; tasks.linux = l;
105+
tasks.la = la; tasks.linuxarm = la;
104106
tasks.w = w; tasks.win = w;
105107
tasks.o = o; tasks.osx = o;
106108
tasks.oa=oa; tasks.osxarm = oa;

0 commit comments

Comments
 (0)