Update libxml to version 2.13.5

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

Hide file tree

Showing 3 changed files with 83 additions and 16 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
@@ -213,8 +213,8 @@ jobs:
 
 
   build-libxml-android:
-    runs-on: ubuntu-20.04
-    container: ubuntu:focal
+    runs-on: ubuntu-24.04
+    container: ubuntu:noble
 
     steps:
     - uses: actions/checkout@v1
@@ -227,10 +227,10 @@ jobs:
           ~/libxml/arm
           ~/libxml/x86_64
           ~/libxml/x86
-        key: libxmlv2.9.14-r5
+        key: libxmlv2.13.5-r1
     - name: Install dependencies
       if: steps.cache-libxml.outputs.cache-hit != 'true'
-      run: ./build/Linux/000-install-dependencies.sh
+      run: ./build/Linux/000-install-dependencies-nobel.sh
     - name: Install NDK
       if: steps.cache-libxml.outputs.cache-hit != 'true'
       run: ./build/Linux/002-install-ndk.sh
@@ -252,11 +252,6 @@ jobs:
       with:
         name: libxml-x86_64
         path: ~/libxml/x86_64
-    - uses: actions/upload-artifact@v4
-      with:
-        name: libxml-x86
-        path: ~/libxml/x86
-
 
   build-swift-corelibs-android-arm-64:
     needs: [build-openssl-android, build-curl-android, build-libxml-android, build-swift-android-arm-64]

diff --git a/build/Linux/000-install-dependencies-nobel.sh b/build/Linux/000-install-dependencies-nobel.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+set -ex
+
+cd $HOME
+
+# Copied from https://github.com/swiftlang/swift-docker/blob/main/swift-ci/main/ubuntu/24.04/Dockerfile
+DEBIAN_FRONTEND="noninteractive"
+
+apt-get -y update && apt-get -y install \
+  build-essential       \
+  clang                 \
+  cmake                 \
+  git                   \
+  icu-devtools          \
+  libc++-18-dev         \
+  libc++abi-18-dev      \
+  libcurl4-openssl-dev  \
+  libedit-dev           \
+  libicu-dev            \
+  libncurses5-dev       \
+  libpython3-dev        \
+  libsqlite3-dev        \
+  libxml2-dev           \
+  ninja-build           \
+  pkg-config            \
+  python3-six           \
+  python3-pip           \
+  python3-pkg-resources \
+  python3-psutil        \
+  python3-setuptools    \
+  rsync                 \
+  swig                  \
+  systemtap-sdt-dev     \
+  tzdata                \
+  uuid-dev              \
+  zip
+
+apt-get install -y  \
+    lsb-release                 \
+    software-properties-common  \
+    gnupg                       \
+    autoconf                    \
+    automake                    \
+    libtool                     \
+    curl                        \
+    wget                        \
+    unzip                       \
+    vim                         \
+    rpl
+
+# Install clang 13
+wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
+apt-get update
+apt-get install -y clang-13
+update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100
+update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100
+update-alternatives --set clang /usr/bin/clang-13
+update-alternatives --set clang++ /usr/bin/clang++-13
+clang --version
+
+# Install swift for bootstraping
+wget https://download.swift.org/swift-6.0.3-release/ubuntu2004/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-ubuntu20.04.tar.gz
+tar -xvzf swift-6.0.3-RELEASE-ubuntu20.04.tar.gz
+rm swift-6.0.3-RELEASE-ubuntu20.04.tar.gz
+mv $HOME/swift-6.0.3-RELEASE-ubuntu20.04 $HOME/swift-toolchain
+export PATH=$HOME/swift-toolchain/usr/bin:$PATH
+echo "export PATH=\$HOME/swift-toolchain/usr/bin:\$PATH" >> .build_env
+echo "export SWIFT_PATH=\$HOME/swift-toolchain/usr/bin" >> .build_env
+
+swift --version
+
diff --git a/build/Linux/043-build-libxml.sh b/build/Linux/043-build-libxml.sh
@@ -3,10 +3,10 @@ set -ex
 
 source $HOME/.build_env
 
-LIBXML2_VERSION=v2.9.14
+LIBXML2_VERSION=v2.13.5
 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