From 323db0a8696972ecb358f62784028131db82e6c8 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 2 Sep 2022 10:22:54 +0200 Subject: [PATCH] cmake(ci): Remove all arm workflows --- cmake/Makefile | 51 ---------------------------- cmake/README.md | 10 ++++++ cmake/docker/arm/glop.Dockerfile | 29 ---------------- cmake/docker/arm/or-tools.Dockerfile | 29 ---------------- 4 files changed, 10 insertions(+), 109 deletions(-) delete mode 100644 cmake/docker/arm/glop.Dockerfile delete mode 100644 cmake/docker/arm/or-tools.Dockerfile diff --git a/cmake/Makefile b/cmake/Makefile index 3e1beb68f5..6f34f55378 100644 --- a/cmake/Makefile +++ b/cmake/Makefile @@ -112,21 +112,6 @@ help: @echo -e "\t${BOLD}sh_glop_${RESET}: Run a Glop container using an Ubuntu:rolling docker image (debug purpose)." @echo -e "\t${BOLD}clean_glop_${RESET}: Remove the Glop docker image (and the save archive if any) for a specific distro." @echo - @echo - @echo -e "\t${BOLD}arm__${RESET}: cross build for aarch64 the docker image." - @echo -e "\t${BOLD}save_arm__${RESET}: Save for aarch64 the docker images." - @echo -e "\t${BOLD}clean_arm__${RESET}: Remove for aarch64 the docker image (and the save archive if any)." - @echo - @echo -e "\tWith ${BOLD}${RESET}:" - @echo -e "\t\t${BOLD}glop${RESET} Build libglop" - @echo -e "\t\t${BOLD}or-tools${RESET} Build libortools" - @echo - @echo -e "\tWith ${BOLD}${RESET}:" - @echo -e "\t\t${BOLD}env${RESET}" - @echo -e "\t\t${BOLD}devel${RESET}" - @echo -e "\t\t${BOLD}build${RESET}" - @echo -e "\t\t${BOLD}test${RESET}" - @echo @echo -e "\tGlobal targets." @echo -e "\t${BOLD}clean${RESET}: Remove ALL caches and docker images." @echo -e "\t${BOLD}clean_${RESET}: Remove cache and docker image for the specified distro." @@ -409,42 +394,6 @@ $(foreach stage,$(TOOLCHAIN_STAGES),$(eval $(call toolchain-stage-target,$(stage clean_toolchains: $(addprefix clean_toolchain_, $(TOOLCHAIN_STAGES)) -rmdir $(addprefix cache/, $(TOOLCHAIN_TARGETS)) -############ -## ARM 64 ## -############ -TARGETS = glop or-tools -STEPS = env devel build test -define make-arm-target = -#$$(info TARGET: $1) -#$$(info Create targets: $(addprefix arm_$1_, $(STEPS))) -arm_targets = $(addprefix arm_$1_, $(STEPS)) -.PHONY: $$(arm_targets) -$$(arm_targets): arm_$1_%: docker/arm/$1.Dockerfile - #@docker image rm -f ${IMAGE}:$$@ 2>/dev/null - ${DOCKER_BUILD_CMD} --target=$$* --tag ${IMAGE}:$$@ -f $$< .. - -save_arm_targets = $(addprefix save_arm_$1_, $(STEPS)) -.PHONY: $$(save_arm_targets) -$$(save_arm_targets): save_arm_$1_%: cache/arm/docker_$1_%.tar -cache/arm/docker_$1_%.tar: arm_$1_% - @rm -f $$@ - mkdir -p cache/arm - docker save ${IMAGE}:$$< -o $$@ - -sh_arm_targets = $(addprefix sh_arm_$1_, $(STEPS)) -.PHONY: $$(sh_arm_targets) -$$(sh_arm_targets): sh_arm_$1_%: arm_$1_% - ${DOCKER_RUN_CMD} -it --name ${PROJECT}_${BUILD_SYSTEM}_$$< ${IMAGE}:$$< - -clean_arm_targets = $(addprefix clean_arm_$1_, $(STEPS)) -.PHONY: $$(clean_arm_targets) -$$(clean_arm_targets): clean_arm_$1_% - docker image rm -f ${IMAGE}:arm_$1_$$* 2>/dev/null - rm -f cache/arm/docker_$1_$$*.tar -endef - -$(foreach target,$(TARGETS),$(eval $(call make-arm-target,$(target)))) - ############# ## VAGRANT ## ############# diff --git a/cmake/README.md b/cmake/README.md index 37309f30a5..a98a0fe2b0 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -38,6 +38,16 @@ Python, Java, .Net]: [![Status][docker_svg]][docker_link] [docker_svg]: https://github.com/google/or-tools/actions/workflows/cmake_docker.yml/badge.svg?branch=main [docker_link]: https://github.com/google/or-tools/actions/workflows/cmake_docker.yml +[![Build Status][aarch64_toolchain_status]][aarch64_toolchain_link] +[![Build Status][mips_toolchain_status]][mips_toolchain_link] +[![Build Status][powerpc_toolchain_status]][powerpc_toolchain_link] + +[aarch64_toolchain_status]: https://github.com/google/or-tools/actions/workflows/aarch64_toolchain.yml/badge.svg +[aarch64_toolchain_link]: https://github.com/google/or-tools/actions/workflows/aarch64_toolchain.yml +[mips_toolchain_status]: https://github.com/google/or-tools/actions/workflows/mips_toolchain.yml/badge.svg +[mips_toolchain_link]: https://github.com/google/or-tools/actions/workflows/mips_toolchain.yml +[powerpc_toolchain_status]: https://github.com/google/or-tools/actions/workflows/powerpc_toolchain.yml/badge.svg +[powerpc_toolchain_link]: https://github.com/google/or-tools/actions/workflows/powerpc_toolchain.yml ## Introduction