Merge pull request #895 from Enaium/master

Update ndk to r28b
Disable unmaintained C-Plus-Plus build test
2025-09-05 07:11:07 +02:00 · 2025-07-31 23:57:06 +02:00 · 2025-07-31 07:01:11 +02:00 · 2025-07-22 13:24:49 -04:00 · 2025-07-22 13:23:18 -04:00 · 2025-07-21 18:26:10 -04:00
7 changed files with 27 additions and 21 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1354,15 +1354,15 @@ jobs:
            make ${{ matrix.arch_name.image }}.test
          fi

-      # Updated on 19/05/2022
+      # Updated on 15/07/2025
      - name: stockfish build test
        if: ${{ matrix.arch_name.stockfish == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
        run: |
-          git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git
-          cd Stockfish/src
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
-          cd ../..
+          git clone --depth 1 --branch sf_17.1 https://github.com/official-stockfish/Stockfish.git
+          cd Stockfish
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src net
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
+          cd ..
          rm -rf Stockfish

      # Updated on 12/09/2022
@@ -1398,15 +1398,15 @@ jobs:
          rm -rf C

      # Updated on 12/09/2022 No longer maintained
-      - name: C-Plus-Plus build test
-        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
-        run: |
-          git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
-          cd C-Plus-Plus
-          git checkout 0594923efa8e6b006a5d754c5e7976850290577c
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
-          cd ..
-          rm -rf C-Plus-Plus
+      #- name: C-Plus-Plus build test
+      #  if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+      #  run: |
+      #    git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
+      #    cd C-Plus-Plus
+      #    git checkout 0594923efa8e6b006a5d754c5e7976850290577c
+      #    ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
+      #    cd ..
+      #    rm -rf C-Plus-Plus

      # Updated on 03/08/2024
      - name: llama.cpp build test
--- a/android-arm/Dockerfile.in
+++ b/android-arm/Dockerfile.in
@@ -17,7 +17,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23

 RUN mkdir -p /build && \
--- a/android-arm64/Dockerfile.in
+++ b/android-arm64/Dockerfile.in
@@ -21,7 +21,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23

 RUN mkdir -p /build && \
--- a/android-x86/Dockerfile
+++ b/android-x86/Dockerfile
@@ -11,7 +11,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23

 RUN mkdir -p /build && \
--- a/android-x86_64/Dockerfile
+++ b/android-x86_64/Dockerfile
@@ -11,7 +11,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23

 RUN mkdir -p /build && \
--- a/imagefiles/entrypoint.sh
+++ b/imagefiles/entrypoint.sh
@@ -28,12 +28,17 @@ if [[ -n $BUILDER_UID ]] && [[ -n $BUILDER_GID ]]; then
    useradd -o -m -g "$BUILDER_GID" -u "$BUILDER_UID" "$BUILDER_USER" 2> /dev/null

    # Change ownership of /dev/pts/0 to new user
-    chown "$BUILDER_UID" /dev/pts/0
+    chown "$BUILDER_UID" /dev/pts/0 2> /dev/null

    export HOME=/home/${BUILDER_USER}
    shopt -s dotglob
    # Move rustup/cargo directories as they are large, and not needed as root
-    mv -t $HOME/ /root/.rustup /root/.cargo
+    if [[ -d /root/.rustup ]]; then
+        mv -t $HOME/ /root/.rustup
+    fi
+    if [[ -d /root/.cargo ]]; then
+        mv -t $HOME/ /root/.cargo
+    fi
    # Copy the rest
    cp -r /root/* $HOME/
    chown -R $BUILDER_UID:$BUILDER_GID $HOME
--- a/imagefiles/install-gosu-binary.sh
+++ b/imagefiles/install-gosu-binary.sh
@@ -56,6 +56,7 @@ url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$
 # download and verify the signature
 export GNUPGHOME="$(mktemp -d)"

+gpg --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://pgp.key-server.io:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
Author	SHA1	Message	Date
Jonas Vautherin	86f66d2270	Merge pull request #895 from Enaium/master Update ndk to r28b	2025-07-31 23:57:06 +02:00
Jonas Vautherin	a9155a09f6	Disable unmaintained C-Plus-Plus build test	2025-07-31 07:01:11 +02:00
Jean-Christophe Fillion-Robin	14a29475ca	Merge pull request #897 from jcfr/update-install-gosu-binary-to-prefer-checking-against-secured-key-server fix(install-gosu-binary): Prefer checking key from server using "hkps" protocol	2025-07-22 13:24:49 -04:00
Jean-Christophe Fillion-Robin	f48bb9b136	fix(entrypoint.sh): Avoid error if rustup is not installed Only move `/root/.rustup` and `/root/.cargo` directories if they exist. This prevents errors when re-using the script in environments where Rust is not installed (e.g. https://github.com/dockbuild/dockbuild). Previously, `mv` would fail if either directory was missing: ``` mv: cannot stat '/root/.rustup': No such file or directory mv: cannot stat '/root/.cargo': No such file or directory ```	2025-07-22 13:23:18 -04:00
Jean-Christophe Fillion-Robin	fe6baacdd3	fix(install-gosu-binary): Prefer checking key from server using "hkps" protocol	2025-07-21 18:26:10 -04:00
Jonas Vautherin	11090d1ded	Update Stockfish to 17.1	2025-07-15 12:24:53 +02:00
Enaium	731b331faf	Update ndk to r28b	2025-07-07 11:07:43 +08:00
Matt McCormick	70cca217e4	Merge pull request #894 from drinkcat/dev-pts-0-silence entrypoint.sh: Silence errors if /dev/pts/0 does not exist	2025-07-02 16:27:25 -04:00
Nicolas Boichat	52604c0b66	entrypoint.sh: Silence errors if /dev/pts/0 does not exist	2025-07-02 11:41:08 +08:00