Add SQLite test build and update Makefile

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Merge pull request #895 from Enaium/master
2025-08-23 00:44:56 +02:00 · 2025-08-05 09:08:38 +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
8 changed files with 138 additions and 148 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -126,8 +126,8 @@ jobs:
              openssl_arg: "android-arm no-shared",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -148,8 +148,8 @@ jobs:
              openssl_arg: "android-arm64 no-shared",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -170,8 +170,8 @@ jobs:
              openssl_arg: "android-x86 no-shared",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -192,8 +192,8 @@ jobs:
              openssl_arg: "android-x86_64 no-shared",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -215,8 +215,8 @@ jobs:
              openssl_arg: "linux-aarch64",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "yes",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -237,8 +237,8 @@ jobs:
              openssl_arg: "linux-aarch64",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -259,8 +259,8 @@ jobs:
              openssl_arg: "linux-aarch64",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -281,8 +281,8 @@ jobs:
              openssl_arg: "linux-aarch64",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -304,8 +304,8 @@ jobs:
              openssl_arg: "",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -327,8 +327,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -349,8 +349,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -371,8 +371,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -394,8 +394,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -416,8 +416,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -438,8 +438,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -461,8 +461,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -483,8 +483,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -505,8 +505,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -527,8 +527,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -549,8 +549,8 @@ jobs:
              openssl_arg: "linux-armv4",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -572,8 +572,8 @@ jobs:
              openssl_arg: "linux-x86",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -595,8 +595,8 @@ jobs:
              openssl_arg: "linux-generic32",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -618,8 +618,8 @@ jobs:
              openssl_arg: "linux-x86_64",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -640,8 +640,8 @@ jobs:
              openssl_arg: "linux-generic64 no-tests no-asm no-hw no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -662,8 +662,8 @@ jobs:
              openssl_arg: "linux-x86_64-clang",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -684,8 +684,8 @@ jobs:
              openssl_arg: "linux-x86_64",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -707,8 +707,8 @@ jobs:
              openssl_arg: "linux-generic32",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -729,8 +729,8 @@ jobs:
              openssl_arg: "linux-generic64",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -752,8 +752,8 @@ jobs:
              openssl_arg: "linux64-s390x",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -775,8 +775,8 @@ jobs:
              openssl_arg: "linux-generic32",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -797,8 +797,8 @@ jobs:
              openssl_arg: "linux-generic32",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -820,8 +820,8 @@ jobs:
              openssl_arg: "linux-generic32",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -842,8 +842,8 @@ jobs:
              openssl_arg: "linux-ppc",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "yes",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -865,8 +865,8 @@ jobs:
              openssl_arg: "linux-ppc64le",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "yes",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -888,8 +888,8 @@ jobs:
              openssl_arg: "linux-ppc64le",
              C: "yes",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -911,8 +911,8 @@ jobs:
              openssl_arg: "linux-generic32 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -934,8 +934,8 @@ jobs:
              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -957,8 +957,8 @@ jobs:
              openssl_arg: "mingw64 no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -979,8 +979,8 @@ jobs:
              openssl_arg: "mingw64 no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1001,8 +1001,8 @@ jobs:
              openssl_arg: "mingw64 no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1023,8 +1023,8 @@ jobs:
              openssl_arg: "mingw64 no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1046,8 +1046,8 @@ jobs:
              openssl_arg: "mingw no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1068,8 +1068,8 @@ jobs:
              openssl_arg: "mingw no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -1091,8 +1091,8 @@ jobs:
              openssl_arg: "mingw no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1113,8 +1113,8 @@ jobs:
              openssl_arg: "mingw64 no-asm",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1136,8 +1136,8 @@ jobs:
              openssl_arg: "linux-x86_64",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1159,8 +1159,8 @@ jobs:
              openssl_arg: "linux-x86",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1181,8 +1181,8 @@ jobs:
              openssl_arg: "linux-x86_64",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "yes",
@@ -1203,8 +1203,8 @@ jobs:
              openssl_arg: "linux-aarch64",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -1226,8 +1226,8 @@ jobs:
              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "yes",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -1237,6 +1237,7 @@ jobs:
              cpython: "no",
              cpython_arg: "",
            }
+          # web-wasi images
          - {
              image: "web-wasi",
              multiarch: "yes",
@@ -1248,8 +1249,8 @@ jobs:
              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -1259,6 +1260,7 @@ jobs:
              cpython: "no",
              cpython_arg: "",
            }
+          # web-wasi-threads images
          - {
              image: "web-wasi-threads",
              multiarch: "yes",
@@ -1270,8 +1272,8 @@ jobs:
              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -1293,8 +1295,8 @@ jobs:
              openssl_arg: "",
              C: "no",
              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
+              SQLite: "no",
+              SQLite_arg: "",
              llama_cpp: "no",
              llama_cpp_arg: "",
              fmt: "no",
@@ -1354,15 +1356,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
@@ -1397,16 +1399,17 @@ jobs:
          cd ..
          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') }}
+      # Updated on 03/08/2025
+      - name: SQLite build test
+        if: ${{ matrix.arch_name.SQLite == '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 }}
+          git clone https://github.com/sqlite/sqlite.git
+          cd sqlite
+          git checkout 1cf61ce636915a5e92d4aa883755cee258aa98d6
+          ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ${{ matrix.arch_name.SQLite_arg }}
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j${nproc} sqlite3 sqlite3.c sqldiff
          cd ..
-          rm -rf C-Plus-Plus
+          rm -rf sqlite

      # Updated on 03/08/2024
      - name: llama.cpp build test
--- a/25
+++ b/25
@@ -9,6 +9,8 @@
 DOCKER := $(or $(OCI_EXE), docker)
 BUILD_DOCKER := $(or $(BUILD_DOCKER), $(DOCKER))
 BUILDAH := $(or $(BUILDAH_EXE), buildah)
+RM = --rm
+
 # Name of the docker-equivalent executable for running test containers.
 # Supports the use case:
 #
@@ -93,13 +95,6 @@ windows-armv7.test_ARGS = --exe-suffix ".exe"
 windows-arm64.test_ARGS = --exe-suffix ".exe"
 bare-armv7emhf-nano_newlib.test_ARGS = --linker-flags="--specs=nosys.specs"

-# On CircleCI, do not attempt to delete container
-# See https://circleci.com/docs/docker-btrfs-error/
-RM = --rm
-ifeq ("$(CIRCLECI)", "true")
-	RM =
-endif
-
 # Tag images with date and Git short hash in addition to revision
 TAG := $(shell date '+%Y%m%d')-$(shell git rev-parse --short HEAD)

@@ -122,22 +117,8 @@ test: base.test $(addsuffix .test,$(IMAGES))
 #
 # Generic Targets (can specialize later).
 #
-
 $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOSITE_PATH)
-	sed \
-		-e '/common.docker/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.docker' \
-		-e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \
-		-e '/common.manylinux_2_28/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_28' \
-		-e '/common.manylinux_2_34/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_34' \
-		-e '/common.manylinux2014/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux2014' \
-		-e '/common.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.crosstool' \
-		-e '/common.buildroot/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.buildroot' \
-		-e '/common-manylinux.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common-manylinux.crosstool' \
-		-e '/common.webassembly/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.webassembly' \
-		-e '/common.windows/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.windows' \
-		-e '/common.dockcross/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.dockcross' \
-		-e '/common.label-and-env/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.label-and-env' \
-		$< > $@
+	sed $(foreach f,$(DOCKER_COMPOSITE_SOURCES),-e '/$(f)/ r $(DOCKER_COMPOSITE_FOLDER_PATH)$(f)') $< > $@

 #
 # web-wasm
--- 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
Bensuperpc	0e30f0a04e	Add SQLite test build and update Makefile Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2025-08-05 09:08:38 +02:00
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