Merge branch 'ci' of github.com:lin1328/ruri into lin1328-ci

Author: Moe-hacker

.github/workflows/Ci.yml

@@ -0,0 +1,82 @@
+name: Cmake and Autotools
+
+on:
+  push:
+    paths:
+      - CMakeLists.txt
+      - configure.ac
+
+jobs:
+  Cmake:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    env:
+      HOST_TRIPLE: x86_64-linux-gnu
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y autoconf automake autopoint binutils bison build-essential cmake doxygen gettext gperf libc6-dev libtool ninja-build pkg-config po4a qemu-user-static tar texinfo texlive valgrind xz-utils
+
+      - name: libcap and libseccomp
+        run: |
+          # libcap
+          wget https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.77.tar.gz
+          tar -xzf libcap-2.77.tar.gz -C .
+
+          make -C libcap-2.77/libcap BUILD_CC=gcc \
+            CC="${HOST_TRIPLE}-gcc" \
+            SHARED=no GOLANG=no PAM_CAP=no DYNAMIC=no lib=lib \
+            COPTS="-O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security" \
+            prefix=$(pwd)/out \
+            install
+
+          # libseccomp
+          wget https://github.com/seccomp/libseccomp/releases/download/v2.6.0/libseccomp-2.6.0.tar.gz
+          tar -xzf libseccomp-2.6.0.tar.gz -C .
+          cd libseccomp-2.6.0
+
+          if [ ! -f configure ]; then
+            autoreconf -fi
+          fi
+          ./configure --disable-shared --enable-static \
+            --prefix=$(pwd)/../out \
+            ${HOST_TRIPLE:+--host=${HOST_TRIPLE}}
+
+          make && make install
+
+      - name: ruri (Cmake)
+        shell: bash
+        run: |
+          cmake -S . -B x86_64 \
+            -DCMAKE_C_COMPILER="${HOST_TRIPLE}-gcc" \
+            -DENABLE_STATIC=ON \
+            -DCMAKE_FIND_ROOT_PATH=$(pwd)/out
+
+          cmake --build x86_64 --parallel
+          ./x86_64/ruri -v
+
+      - name: ruri (Autotools)
+        shell: bash
+        run: |
+          autoreconf -fi
+          ./configure --enable-static ${HOST_TRIPLE:+--host=${HOST_TRIPLE}} \
+            CPPFLAGS="-I$(pwd)/out/include" \
+            LDFLAGS="-L$(pwd)/out/lib"
+
+          make -j$(nproc)
+          ./ruri -v && make distclean
+
+      - name: ruri (Autotools Android Core)
+        shell: bash
+        run: |
+          sudo apt install -y qemu-user-static
+
+          ./configure --enable-static --enable-coreonly --host=aarch64-linux-android \
+              CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang \
+              AR=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar \
+              RANLIB=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
+          make && qemu-aarch64-static ./ruri -v

.github/workflows/build.yml

@@ -53,13 +53,9 @@ jobs:
     strategy:
       matrix:
         arch: [x86_64, x86, aarch64, armhf, armv7, ppc64le, loongarch64, riscv64, s390x]
-        #arch: [x86_64, x86, aarch64, armhf, armv7, ppc64le, loongarch64, riscv64]
     env:
       ARCHITECTURE: ${{ matrix.arch }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: Install Dependencies
         run: |
           sudo apt-get update
@@ -68,7 +64,7 @@ jobs:
 
       - name: Build ruri for containers
         run: |
-          cd build
+          mkdir -p build && cd build
           git clone --depth 1 https://github.com/moe-hacker/ruri.git
           cd ruri
           cc -Wl,--gc-sections -static src/*.c src/easteregg/*.c -o ruri -lcap -lseccomp -lpthread
@@ -93,7 +89,7 @@ jobs:
         shell: bash
         run: |
           cd build
-          cp build.sh "$ARCHITECTURE/build.sh"
+          cp ruri/build/build.sh "$ARCHITECTURE/build.sh"
           sudo chmod +x ../ruri
           sudo chmod +x "$ARCHITECTURE/build.sh"
 

.github/workflows/codeql.yml

@@ -83,14 +83,11 @@ jobs:
       run: |
          sudo apt update
          sudo apt install -y \
-              make \
-              clang \
-              libseccomp-dev \
-              libcap-dev \
-              libc6-dev \
-              binutils
-          aclocal
-          autoconf
+            autoconf automake libtool make gcc \
+            libseccomp-dev libcap-dev libc6-dev \
+            binutils
+              
+          autoreconf -fi
           ./configure --enable-debug --enable-dev
           make
 

.github/workflows/test.yml

@@ -9,7 +9,6 @@ on:
       - 'build/**'
       - 'test/**'
       - 'configure.ac'
-      - 'Makefile'
   pull_request:
 
 jobs:
@@ -24,10 +23,9 @@ jobs:
         run: |
           sudo apt update && sudo apt install -y git wget
           sudo apt install --no-install-recommends -y curl xz-utils \
-          make \
-          clang \
-          libseccomp-dev \
-          libcap-dev \
-          libc6-dev \
-          binutils qemu-user-static uidmap
-          make -C test
+            autoconf automake libtool make gcc \
+            libseccomp-dev libcap-dev libc6-dev \
+            binutils qemu-user-static uidmap
+
+          autoreconf -fi && ./configure
+          make test

.gitignore

@@ -1,7 +1,6 @@
 # Binary
 ruri
-ruri-amd64.zip
-ruri-arm64.zip
+ruri-*.zip
 # Editor configuration.
 .vscode/
 # Gdb log
@@ -22,27 +21,42 @@ debian/debhelper-build-stamp
 debian/files
 tmpdir*
 test-root
+
+# Cmake
 cmake_install.cmake
 CMakeCache.txt
 CMakeFiles
-build/.cmake
-build/compile_commands.json
-build/Makefile
-build/build.ninja
-build/.ninja_deps
-build/.ninja_log
+.cmake
+*.json
+build.ninja
+.ninja_deps
+.ninja_log
+
+# Automake
+build-aux
 autom4te.cache
+.deps
+.dirstamp
 aclocal.m4
 config.log
 config.status
 config.h
 config.h.in
+config.h.in~
 compile
 configure~
 install-sh
 missing
 configure
 Makefile.in
+depcomp
+config.guess
+config.sub
+test-driver
+*.Po
+
+*.o
+Makefile
 
 # VitePress
 docs/.vitepress/cache