From 008b541580a4f3a9bf80d4c28a00202f033b5aa3 Mon Sep 17 00:00:00 2001 From: frysee Date: Mon, 12 May 2025 14:01:30 +0200 Subject: [PATCH 1/3] feat: pull image from repo before attempting to build it from scratch --- makefile.toolchain | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile.toolchain b/makefile.toolchain index d5a5bf878..50fc4fcc8 100644 --- a/makefile.toolchain +++ b/makefile.toolchain @@ -20,6 +20,7 @@ $(INIT_IF_NECESSARY): $(GIT_IF_NECESSARY) $(GIT_IF_NECESSARY): mkdir -p toolchains + docker pull ghcr.io/loveretro/$(PLATFORM)-toolchain:latest git clone https://github.com/LoveRetro/$(PLATFORM)-toolchain/ toolchains/$(PLATFORM)-toolchain clean: From 76d81bc4ba8c7123f22e9624daa544490b403ab7 Mon Sep 17 00:00:00 2001 From: frysee Date: Mon, 12 May 2025 14:17:40 +0200 Subject: [PATCH 2/3] Bypass auto build --- makefile.toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile.toolchain b/makefile.toolchain index 50fc4fcc8..75bde6e57 100644 --- a/makefile.toolchain +++ b/makefile.toolchain @@ -20,8 +20,8 @@ $(INIT_IF_NECESSARY): $(GIT_IF_NECESSARY) $(GIT_IF_NECESSARY): mkdir -p toolchains - docker pull ghcr.io/loveretro/$(PLATFORM)-toolchain:latest git clone https://github.com/LoveRetro/$(PLATFORM)-toolchain/ toolchains/$(PLATFORM)-toolchain + docker pull ghcr.io/loveretro/$(PLATFORM)-toolchain:latest && touch toolchains/$(PLATFORM)-toolchain/.build clean: cd toolchains/$(PLATFORM)-toolchain && make clean From c8600c88429b32239f4fced7b5384868e437b9e7 Mon Sep 17 00:00:00 2001 From: frysee Date: Mon, 12 May 2025 14:38:30 +0200 Subject: [PATCH 3/3] Unify image name across local and ci builds --- makefile.toolchain | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/makefile.toolchain b/makefile.toolchain index 75bde6e57..0b2eadaf2 100644 --- a/makefile.toolchain +++ b/makefile.toolchain @@ -11,9 +11,10 @@ GUEST_WORKSPACE=/root/workspace GIT_IF_NECESSARY=toolchains/$(PLATFORM)-toolchain INIT_IF_NECESSARY=toolchains/$(PLATFORM)-toolchain/.build +IMAGE_NAME=ghcr.io/loveretro/$(PLATFORM)-toolchain:latest all: $(INIT_IF_NECESSARY) - docker run -it --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) $(PLATFORM)-toolchain /bin/bash + docker run -it --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) $(IMAGE_NAME) /bin/bash $(INIT_IF_NECESSARY): $(GIT_IF_NECESSARY) cd toolchains/$(PLATFORM)-toolchain && make .build @@ -21,19 +22,19 @@ $(INIT_IF_NECESSARY): $(GIT_IF_NECESSARY) $(GIT_IF_NECESSARY): mkdir -p toolchains git clone https://github.com/LoveRetro/$(PLATFORM)-toolchain/ toolchains/$(PLATFORM)-toolchain - docker pull ghcr.io/loveretro/$(PLATFORM)-toolchain:latest && touch toolchains/$(PLATFORM)-toolchain/.build + docker pull $(IMAGE_NAME) && touch toolchains/$(PLATFORM)-toolchain/.build clean: cd toolchains/$(PLATFORM)-toolchain && make clean build: $(INIT_IF_NECESSARY) - docker run --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) -e COMPILE_CORES=$(COMPILE_CORES) $(PLATFORM)-toolchain /bin/bash -c '. ~/.bashrc && cd /root/workspace && make' + docker run --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) -e COMPILE_CORES=$(COMPILE_CORES) $(IMAGE_NAME) /bin/bash -c '. ~/.bashrc && cd /root/workspace && make' build-cores: $(INIT_IF_NECESSARY) - docker run --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) -e COMPILE_CORES=$(COMPILE_CORES) $(PLATFORM)-toolchain /bin/bash -c '. ~/.bashrc && cd /root/workspace && make cores' + docker run --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) -e COMPILE_CORES=$(COMPILE_CORES) $(IMAGE_NAME) /bin/bash -c '. ~/.bashrc && cd /root/workspace && make cores' build-core: $(INIT_IF_NECESSARY) ifndef CORE $(error CORE is not set) endif - docker run --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) -e COMPILE_CORES=$(COMPILE_CORES) -e CORE=$(CORE) $(PLATFORM)-toolchain /bin/bash -c '. ~/.bashrc && cd /root/workspace && make core' + docker run --rm -v $(HOST_WORKSPACE):$(GUEST_WORKSPACE) -e COMPILE_CORES=$(COMPILE_CORES) -e CORE=$(CORE) $(IMAGE_NAME) /bin/bash -c '. ~/.bashrc && cd /root/workspace && make core'