ci: linux build

oomeow · Oct 30, 2024 · af2269f · af2269f
1 parent 93fe4cb
commit af2269f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/build-for-linux/Dockerfile b/.github/build-for-linux/Dockerfile
@@ -14,13 +14,12 @@ RUN rm -f /etc/apt/sources.list.d/debian.sources && \
     echo "deb http://deb.debian.org/debian/ trixie-backports main contrib non-free non-free-firmware" | tee -a /etc/apt/sources.list && \
     echo "deb http://deb.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" | tee -a /etc/apt/sources.list
 RUN apt-get update && \ 
-    apt-get install -y --no-install-recommends ca-certificates curl gnupg netbase build-essential pkg-config sq wget tar xz-utils && \ 
+    apt-get install -y --no-install-recommends ca-certificates curl wget gnupg g++-aarch64-linux-gnu libc6-dev-arm64-cross build-essential pkg-config file tar xz-utils && \ 
     rm -rf /var/lib/apt/lists/*
 
 RUN dpkg --add-architecture arm64 && \
     apt-get update && \
-    apt-get install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libssl3:arm64 libcups2:arm64 libglib2.0-dev:arm64 && \
-    apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && \
+    apt-get install -y --no-install-recommends libwebkit2gtk-4.1-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64 && \
     rm -f /var/lib/apt/lists/* 
 
 # Install Rust

diff --git a/.github/build-for-linux/entrypoint.sh b/.github/build-for-linux/entrypoint.sh
@@ -19,11 +19,11 @@ elif [ "$INPUT_TARGET" = "i686-unknown-linux-gnu" ]; then
     export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig/:$PKG_CONFIG_PATH
     export PKG_CONFIG_SYSROOT_DIR=/
 elif [ "$INPUT_TARGET" = "aarch64-unknown-linux-gnu" ]; then
-    dpkg --add-architecture arm64
-    apt-get update -y --allow-releaseinfo-change
-    apt-get autoremove -y
-    apt-get install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libssl3:arm64 libcups2:arm64 libglib2.0-dev:arm64
-    apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libwebkit2gtk-4.1-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
+    # dpkg --add-architecture arm64
+    # apt-get update -y --allow-releaseinfo-change
+    # apt-get autoremove -y
+    # apt-get install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libssl3:arm64 libcups2:arm64 libglib2.0-dev:arm64
+    # apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libwebkit2gtk-4.1-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
     # export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
     # export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
     # export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++