Continue to use separate container for standard ARM builds

kriszyp · Jul 30, 2022 · a9e0fb3 · a9e0fb3
1 parent fa8ee64
commit a9e0fb3
Showing 1 changed file with 33 additions and 15 deletions.
diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml
@@ -44,6 +44,7 @@ jobs:
         with:
           files: prebuild-win32.tar
   build-centos-7:
+    #if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-18.04
     container: quay.io/pypa/manylinux2014_x86_64
     steps:
@@ -57,28 +58,13 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14
-      - run: apt-get update
-      - run: apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf g++-aarch64-linux-gnu g++-arm-linux-gnueabihf
-      #- run: wget https://musl.cc/aarch64-linux-musl-cross.tgz
       - run: curl https://raw.githubusercontent.com/kriszyp/musl-bins/main/aarch64-linux-musl-cross.tgz --output aarch64-linux-musl-cross.tgz
       - run: tar -xf aarch64-linux-musl-cross.tgz && pwd && ls
       - run: curl https://raw.githubusercontent.com/kriszyp/musl-bins/main/armv7l-linux-musleabihf-cross.tgz --output armv7l-linux-musleabihf-cross.tgz
       - run: tar -xf armv7l-linux-musleabihf-cross.tgz && pwd && ls
       - run: curl https://raw.githubusercontent.com/kriszyp/musl-bins/main/x86_64-linux-musl-native.tgz --output x86_64-linux-musl-native.tgz
       - run: tar -xf x86_64-linux-musl-native.tgz && pwd && ls      
       - run: npm install
-      - run: npm run prebuild-libc
-        #if: startsWith(github.ref, 'refs/tags/')
-        env:
-          PREBUILD_ARCH: arm64
-          CC: aarch64-linux-gnu-gcc
-          CXX: aarch64-linux-gnu-g++
-      - run: npm run prebuild-libc
-        env:
-          PREBUILD_ARCH: arm
-          PREBUILD_ARMV: 7
-          CC: arm-linux-gnueabihf-gcc
-          CXX: arm-linux-gnueabihf-g++
       - run: npm run prebuild-libc
         if: startsWith(github.ref, 'refs/tags/')
         env:
@@ -109,3 +95,35 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: prebuild-linux.tar
+  build-linux-arm:
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-18.04
+    container: quay.io/pypa/manylinux_2_24_x86_64
+    steps:
+      - run: apt-get update
+      - run: apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf g++-aarch64-linux-gnu g++-arm-linux-gnueabihf
+      - run: ldd --version ldd
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - run: npm install
+      - run: npm run prebuild-libc
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          PREBUILD_ARCH: arm64
+          CC: aarch64-linux-gnu-gcc
+          CXX: aarch64-linux-gnu-g++
+      - run: npm run prebuild-libc
+        env:
+          PREBUILD_ARCH: arm
+          PREBUILD_ARMV: 7
+          CC: arm-linux-gnueabihf-gcc
+          CXX: arm-linux-gnueabihf-g++
+      - run: tar --create --verbose --file=prebuild-linux-arm.tar -C prebuilds .
+      - name: Prebuild
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v1
+        with:
+          files: prebuild-linux-arm.tar