Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-08-03 15:32:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update CI

Browse Source 
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc
2025-08-02 14:47:24 +02:00
parent 86f66d2270
commit 1d981fd9aa
2 changed files with 120 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
.github/workflows/main.yml vendored
View File

@@ -126,8 +126,8 @@ jobs:
openssl_arg: "android-arm no-shared",
C: "no",
C_arg: "",
C-Plus-Plus: "yes",
C-Plus-Plus_arg: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "yes",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_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: "",
TinyCC: "no",
TinyCC_arg: "",
llama_cpp: "no",
llama_cpp_arg: "",
fmt: "no",
@@ -1248,8 +1248,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: "",
TinyCC: "no",
TinyCC_arg: "",
llama_cpp: "no",
llama_cpp_arg: "",
fmt: "no",
@@ -1270,8 +1270,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: "",
TinyCC: "no",
TinyCC_arg: "",
llama_cpp: "no",
llama_cpp_arg: "",
fmt: "no",
@@ -1293,8 +1293,8 @@ jobs:
openssl_arg: "",
C: "no",
C_arg: "",
C-Plus-Plus: "no",
C-Plus-Plus_arg: "",
TinyCC: "no",
TinyCC_arg: "",
llama_cpp: "no",
llama_cpp_arg: "",
fmt: "no",
@@ -1397,16 +1397,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') }}
# 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 02/08/2025
- name: TinyCC build test
if: ${{ matrix.arch_name.TinyCC == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
run: |
git clone https://github.com/TinyCC/tinycc.git
cd tinycc
git checkout 666e88ee2a66366a81497b4e927b02c69f18a165
./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure --cpu=x86_64 ${{ matrix.arch_name.TinyCC_arg }}
./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j${nproc}
cd ..
rm -rf tinycc
# Updated on 03/08/2024
- name: llama.cpp build test

25
Makefile
View File

@@ -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