Build armel and armhf

brain-hackers · Feb 4, 2024 · e5d87d4 · e5d87d4
1 parent 77077cb
commit e5d87d4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,8 +7,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-linux-armv5:
-    name: linux/armv5
+  build-linux-arm:
+    name: linux/arm
     runs-on: ubuntu-20.04
     steps:
       -
@@ -18,7 +18,7 @@ jobs:
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       -
-        name: Build
+        name: Build (armel)
         run: |
           docker run --platform linux/arm/v5 -i -v $PWD:/ws debian:stable bash << EOF
           set -xeu
@@ -27,17 +27,42 @@ jobs:
           ./autogen.sh
           ./configure --enable-static
           make
-          mv ico ico-dvd
-          chmod +x ico-dvd
+          mkdir armel
+          mv ico armel/ico-dvd
+          chmod +x armel/ico-dvd
           EOF
+
+      -
+        name: Clean
+        run: |
+          make distclean
+
+      -
+        name: Build (armhf)
+        run: |
+          docker run --platform linux/arm/v7 -i -v $PWD:/ws debian:stable bash << EOF
+          set -xeu
+          cd /ws
+          apt update; apt -y install libx11-dev xorg-dev xutils-dev build-essential autoconf musl xcb libxcb-util-dev libxau-dev x11proto-dev libxdmcp-dev libxau6
+          ./autogen.sh
+          ./configure --enable-static
+          make
+          mkdir armhf
+          mv ico armhf/ico-dvd
+          chmod +x armhf/ico-dvd
+          EOF
+
       -
         name: Prepare go-bin-deb
         run: |
           wget https://github.com/mh-cbon/go-bin-deb/releases/download/0.0.19/go-bin-deb-amd64.deb && \
           sudo apt -y install ./go-bin-deb-amd64.deb && \
           rm go-bin-deb-amd64.deb && \
-          sudo chmod +x ico-dvd && \
+          sudo chmod +x armel/ico-dvd && \
           go-bin-deb generate --file .github/workflows/deb.json --wd . --version 0.0.1 --arch armel
+          rm -rf debian
+          sudo chmod +x armhf/ico-dvd && \
+          go-bin-deb generate --file .github/workflows/deb.json --wd . --version 0.0.1 --arch armhf
 
       -
         name: Save artifacts

diff --git a/.github/workflows/deb.json b/.github/workflows/deb.json
@@ -2,11 +2,12 @@
     "name": "x11-ico-dvd",
     "maintainer": "Takehiro Ogura <i@yude.jp>",
     "version": "0.0.1",
-    "arch": "armel",
+    "arch": "!arch!",
     "files": [
         {
-            "from": "ico-dvd",
+            "from": "!arch!/ico-dvd",
             "to": "/usr/bin",
+            "base": "!arch!",
             "fperm": "0755"
         }
     ],