Merge pull request #895 from Enaium/master

Update ndk to r28b

.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
+          git clone --depth 1 --branch sf_17.1 https://github.com/official-stockfish/Stockfish.git
-          cd Stockfish/src
+          cd Stockfish
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src net
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
-          cd ../..
+          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
+      #- name: C-Plus-Plus build test
-        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+      #  if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
-        run: |
+      #  run: |
-          git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
+      #    git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
-          cd C-Plus-Plus
+      #    cd C-Plus-Plus
-          git checkout 0594923efa8e6b006a5d754c5e7976850290577c
+      #    git checkout 0594923efa8e6b006a5d754c5e7976850290577c
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
+      #    ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
-          cd ..
+      #    cd ..
-          rm -rf C-Plus-Plus
+      #    rm -rf C-Plus-Plus
 
       # Updated on 03/08/2024
       - name: llama.cpp build test

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 && \

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 && \

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 && \

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 && \

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

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