Add aarch64 to CI

shiro · May 24, 2024 · 99b3f74 · 99b3f74
1 parent ee62551
commit 99b3f74
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -22,8 +22,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [x86_64, x86,
-        # aarch64, armv7, s390x, ppc64le
+        target: [
+        #x86_64, x86,
+        aarch64
+        # armv7, s390x, ppc64le
         ]
     steps:
       - uses: actions/checkout@v3

diff --git a/ci/prepare-ci-container.sh b/ci/prepare-ci-container.sh
@@ -2,16 +2,22 @@
 
 set -e
 
+if command -v apt-get &> /dev/null; then
+    echo "using apt-get"
+    apt-get update
+    apt-get install -y libxkbcommon0 libxkbcommon-dev libxkbcommon-tools automake libtool pkg-config
+elif command -v yum &> /dev/null; then
+    echo "using yum"
+    yum install -y libxkbcommon-devel libatomic
+fi
 
-yum install -y libxkbcommon-devel libatomic
-
-cd /tmp
-git clone https://github.com/pkgconf/pkgconf
-cd pkgconf
-
-./autogen.sh
-./configure \
-     --with-system-libdir=/lib:/usr/lib \
-     --with-system-includedir=/usr/include
-make
-make install
+# cd /tmp
+# git clone https://github.com/pkgconf/pkgconf
+# cd pkgconf
+#
+# ./autogen.sh
+# ./configure \
+#      --with-system-libdir=/lib:/usr/lib \
+#      --with-system-includedir=/usr/include
+# make
+# make install