Dev: fix container on ubuntu

readdle · Jan 11, 2025 · e219086 · e219086
1 parent 3ea5d18
commit e219086
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-android-toolchain.yml b/.github/workflows/build-android-toolchain.yml
@@ -14,12 +14,12 @@ jobs:
 
   build-swift-android-arm-64:
     runs-on: ubuntu-20.04
+    container: ubuntu:focal
 
     steps:
-    - name: Free Disk Space (Ubuntu)
-      uses: jlumbroso/free-disk-space@main
-    - name: Clone scripts
-      uses: actions/checkout@v1
+    - uses: actions/checkout@v1
+    - name: Install dependencies
+      run: ./build/Linux/000-install-dependencies.sh
     - name: Install NDK
       run: ./build/Linux/002-install-ndk.sh
     - name: Define build folders
@@ -227,7 +227,7 @@ jobs:
           ~/libxml/arm
           ~/libxml/x86_64
           ~/libxml/x86
-        key: libxmlv2.9.14-r5
+        key: libxmlv2.9.14-r7
     - name: Install dependencies
       if: steps.cache-libxml.outputs.cache-hit != 'true'
       run: ./build/Linux/000-install-dependencies.sh

diff --git a/build/Linux/043-build-libxml.sh b/build/Linux/043-build-libxml.sh
@@ -6,7 +6,7 @@ source $HOME/.build_env
 LIBXML2_VERSION=v2.9.14
 GIT_URL_LIBXML2=https://gitlab.gnome.org/GNOME/libxml2.git
 
-archs=(arm arm64 x86 x86_64)
+archs=(arm arm64 x86_64)
 
 rm -rf $LIBXML_LIBS
 mkdir -p $LIBXML_LIBS
@@ -77,7 +77,7 @@ do
                 --with-html \
                 --without-ftp
 
-            make libxml2.la && make install-libLTLIBRARIES
+            make install-libLTLIBRARIES
 
             pushd include
                 make install