CI: linux-arm64

floooh · Jan 18, 2025 · 2b7a879 · 2b7a879
1 parent a6a8a17
commit 2b7a879
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,3 +42,16 @@ jobs:
           run:  python fips build linux-ninja-release
         - name: test
           run:  python3 fips run_tests linux-ninja-release
+    linux-arm64:
+        runs-on: ubuntu-24.04-arm
+        steps:
+        - uses: lukka/get-cmake@latest
+        - uses: actions/checkout@v4
+          with:
+            submodules: true
+        - name: build debug
+          run:  python fips build linux-ninja-debug
+        - name: build release
+          run:  python fips build linux-ninja-release
+        - name: test
+          run:  python3 fips run_tests linux-ninja-release
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -57,7 +57,7 @@ jobs:
         name: osx-arm64-ninja-release
         path: fips-files/deploy/sokol-tools/osx-arm64-ninja-release/sokol-shdc
         retention-days: 1
-  linux:
+  linux_intel:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -70,11 +70,27 @@ jobs:
     - name: upload
       uses: actions/upload-artifact@v4
       with:
-        name: linux-ninja-release
+        name: linux-x86_64-ninja-release
+        path: sokol-shdc
+        retention-days: 1
+  linux_arm:
+    runs-on: ubuntu-24.04-arm
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: build
+      run: |
+        ./build_docker.sh
+        md5sum sokol-shdc
+    - name: upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: linux-aarch64-ninja-release
         path: sokol-shdc
         retention-days: 1
   deploy:
-    needs: [windows, mac_intel, mac_arm, linux]
+    needs: [windows, mac_intel, mac_arm, linux_intel, linux_arm]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -97,13 +113,18 @@ jobs:
       with:
         name: linux-ninja-release
         path: bin/linux
+    - uses: actions/download-artifact@v4
+      with:
+        name: linux-ninja-release
+        path: bin/linux_arm64
     - name: "commit and push"
       run: |
         md5sum bin/win32/sokol-shdc.exe
         md5sum bin/osx/sokol-shdc
         md5sum bin/osx_arm64/sokol-shdc
         md5sum bin/linux/sokol-shdc
-        chmod a+x bin/osx/sokol-shdc bin/osx_arm64/sokol-shdc bin/linux/sokol-shdc
+        md5sum bin/linux_arm64/sokol-shdc
+        chmod a+x bin/osx/sokol-shdc bin/osx_arm64/sokol-shdc bin/linux/sokol-shdc bin/linux_arm64/sokol-shdc
         git config user.email "none"
         git config user.name "GH Action"
         git add .

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine
+FROM --platform=$TARGETPLATFORM alpine
 RUN apk add build-base git python3 cmake ninja
 ADD . /workspace/sokol-tools
 RUN cd /workspace/sokol-tools && \
     ./fips build linux-ninja-release && \
-    strip /workspace/fips-deploy/sokol-tools/linux-ninja-release/sokol-shdc
+    strip /workspace/fips-deploy/sokol-tools/linux-ninja-release/sokol-shdc