From 9d0b98936d6fb28852d7cfb1c27a5cbdb7c0e7cd Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Fri, 31 Jul 2026 19:53:52 +0200 Subject: [PATCH] builder image --- .woodpecker.yaml | 3 +-- Makefile | 15 +++++++++++++-- metadata.json | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yaml b/.woodpecker.yaml index 3a8ad79..44fbbe0 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -6,9 +6,8 @@ steps: - make ci-version - name: export - image: alpine + image: git.teletypegames.org/internal/love-builder:latest commands: - - apk add --no-cache zip make curl unzip - make ci-export - name: upload diff --git a/Makefile b/Makefile index dcaf3cc..edd174a 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,11 @@ OUTPUT_WEB_ZIP = $(PROJECT)-$(VERSION).html.zip VERSION_FILE = .version +# The love-builder CI image pre-fetches love.js here; local builds fall +# back to downloading it from GitHub. +LOVEJS_URL = https://github.com/2dengine/love.js/archive/refs/heads/master.zip +LOVEJS_CACHE = /opt/lovejs.zip + all: build build: @@ -35,8 +40,13 @@ love: web: love @mkdir -p $(WEB_DIR) - @echo "==> Downloading love.js (2dengine)" - curl -sSL https://github.com/2dengine/love.js/archive/refs/heads/master.zip -o $(DIST_DIR)/lovejs.zip + @if [ -f $(LOVEJS_CACHE) ]; then \ + echo "==> Using cached love.js ($(LOVEJS_CACHE))"; \ + cp $(LOVEJS_CACHE) $(DIST_DIR)/lovejs.zip; \ + else \ + echo "==> Downloading love.js (2dengine)"; \ + curl -sSL $(LOVEJS_URL) -o $(DIST_DIR)/lovejs.zip; \ + fi unzip -o $(DIST_DIR)/lovejs.zip -d $(DIST_DIR)/lovejs-src rm -f $(DIST_DIR)/lovejs.zip @echo "==> Assembling web bundle" @@ -97,5 +107,6 @@ ci-upload: ci-update: @VERSION=$$(cat $(VERSION_FILE)); \ curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=love&version=$$VERSION"; \ + curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=love-web&version=$$VERSION" .PHONY: all build love web export watch clean ci-version ci-export ci-upload ci-update \ No newline at end of file diff --git a/metadata.json b/metadata.json index fa16284..83823e4 100644 --- a/metadata.json +++ b/metadata.json @@ -3,7 +3,7 @@ "title": "Love2D Demo", "author": "Teletype Games", "desc": "It's a simple demo program in Love2D", - "site": "https://git.teletype.hu/games/lovedemo", + "site": "https://git.teletypegames.org/games/lovedemo", "license": "MIT License", "version": "1.0.0" }