Build ARM64 server releases

Author: pimterry

build-release.sh

@@ -10,15 +10,20 @@ set -e
 # ------------------------------------------------------------------------
 
 TARGET_PLATFORM=$1
+TARGET_ARCH=$2
 
-echo "CONFIGURING FOR $TARGET_PLATFORM"
+echo "CONFIGURING FOR $TARGET_PLATFORM $TARGET_ARCH"
 
 if [ -z "$TARGET_PLATFORM" ]; then
     echo 'A target platform (linux/win32/darwin) is required'
     exit 1
 fi
 
-TARGET_ARCH=`node -e 'console.log(process.arch)'`
+if [ -z "$TARGET_ARCH" ]; then
+    echo 'A target platform (x64/arm/arm64) is required'
+    exit 1
+fi
+
 
 export PATH=./node_modules/.bin:$PATH
 
@@ -27,6 +32,10 @@ export npm_config_platform=$TARGET_PLATFORM
 # Pick the target platform for node-pre-gyp:
 export npm_config_target_platform=$TARGET_PLATFORM
 
+# Same for architecture:
+export npm_config_arch=$TARGET_ARCH
+export npm_config_target_arch=$TARGET_ARCH
+
 # Disable node-gyp-build for win-version-info only. Without this, it's
 # rebuilt for Linux, even given $TARGET_PLATFORM=win32, and then breaks
 # at runtime even though there are valid win32 prebuilds available.
@@ -45,7 +54,7 @@ rm -rf ./tmp || true
 # ------------------------------------------------------------------------
 
 echo
-echo "BUILDING FOR $TARGET_PLATFORM"
+echo "BUILDING FOR $TARGET_PLATFORM $TARGET_ARCH"
 echo
 
 oclif-dev pack --targets=$TARGET
@@ -62,22 +71,35 @@ echo
 # Whitelist (as a regex) for packages that may include binaries for other platforms
 PACKAGE_WHITELIST=''
 
+case "$TARGET_ARCH" in
+    x64)
+        EXPECTED_ARCH_STRING='x86[_-]64|80386'
+        ;;
+    arm64)
+        EXPECTED_ARCH_STRING='arm64'
+        ;;
+    *)
+        echo "Unknown arch $TARGET_ARCH"
+        exit 1
+        ;;
+esac
+
 case "$TARGET_PLATFORM" in
     linux)
-        EXPECTED_BIN_STRING="ELF"
+        EXPECTED_PLATFORM_STRING='ELF'
         # Registry-js builds raw on non-Windows, but never used
         # Win-version info includes prebuilds for Windows on all platforms
-        PACKAGE_WHITELIST="registry-js|win-version-info/prebuilds"
+        PACKAGE_WHITELIST='registry-js|win-version-info/prebuilds'
         ;;
     win32)
-        EXPECTED_BIN_STRING="MS Windows"
-        PACKAGE_WHITELIST=""
+        EXPECTED_PLATFORM_STRING='MS Windows'
+        PACKAGE_WHITELIST=''
         ;;
     darwin)
-        EXPECTED_BIN_STRING="Mach-O"
+        EXPECTED_PLATFORM_STRING='Mach-O'
         # Registry-js builds raw on non-Windows, but never used
         # Win-version info includes prebuilds for Windows on all platforms
-        PACKAGE_WHITELIST="registry-js|win-version-info/prebuilds"
+        PACKAGE_WHITELIST='registry-js|win-version-info/prebuilds'
         ;;
     *)
         echo "Unknown platform $TARGET_PLATFORM"
@@ -86,7 +108,7 @@ case "$TARGET_PLATFORM" in
 esac
 
 echo "CHECKING FOR BAD CONFIG"
-echo "EXPECTING: $EXPECTED_BIN_STRING"
+echo "EXPECTING: $EXPECTED_PLATFORM_STRING and $EXPECTED_ARCH_STRING"
 echo "WHITELIST: $PACKAGE_WHITELIST"
 
 # Find all *.node files in the build that `file` doesn't describe with the above
@@ -98,7 +120,7 @@ NATIVE_BINARIES=$(
 )
 echo "NATIVE BINS: $NATIVE_BINARIES"
 
-BAD_BINS=$(echo "$NATIVE_BINARIES" | grep -v "$EXPECTED_BIN_STRING" || true)
+BAD_BINS=$(echo "$NATIVE_BINARIES" | grep -vE "$EXPECTED_PLATFORM_STRING" | grep -vE "$EXPECTED_ARCH_STRING" || true)
 
 if [[ ! -z "$PACKAGE_WHITELIST" ]]; then
     BAD_BINS=$(echo "$BAD_BINS" | grep -E -v "$PACKAGE_WHITELIST" || true)
@@ -108,7 +130,7 @@ if [ `echo "$BAD_BINS" | wc -w` -ne 0 ]; then
     echo
     echo "***** BUILD FAILED *****"
     echo
-    echo "Invalid build! $TARGET_PLATFORM build has binaries for the wrong platform."
+    echo "Invalid build! $TARGET build has binaries for the wrong platform."
     echo "Bad binaries are:"
     echo "$BAD_BINS"
     echo

pack.ts

@@ -82,17 +82,20 @@ const packageApp = async () => {
     console.log('Building for Linux');
     await fs.mkdir(path.join(OUTPUT_DIR, 'nss'));
     await fs.copy(path.join(__dirname, 'nss', 'linux'), path.join(OUTPUT_DIR, 'nss', 'linux'));
-    await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+    await spawn(buildScript, ['linux', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 
-    console.log('Building for Darwin');
+    console.log('Building for Darwin x64');
     await fs.remove(path.join(OUTPUT_DIR, 'nss', 'linux'));
     await fs.copy(path.join(__dirname, 'nss', 'darwin'), path.join(OUTPUT_DIR, 'nss', 'darwin'));
-    await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+    await spawn(buildScript, ['darwin', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+
+    console.log('Building for Darwin arm64');
+    await spawn(buildScript, ['darwin', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 
     console.log('Building for Win32');
     await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin'));
     await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32'));
-    await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+    await spawn(buildScript, ['win32', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 
     // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is
     // really platform agnostic). Not necessary, probably won't work - drop it.