pipeline update

.woodpecker.yml

@@ -1,21 +1,20 @@
-environment: &environment
-  GAME_NAME: mranderson
-  GAME_LANG: lua
-
 steps:
+  - name: version
+    image: alpine
+    commands:
+      - 'apk add --no-cache make'
+      - 'make ci-version'
+
   - name: build
     image: git.teletype.hu/internal/tic80pro:latest
     environment:
-      <<: *environment
       XDG_RUNTIME_DIR: /tmp
     commands:
-      - make build PROJECT=$GAME_NAME
+      - 'make ci-export'
-      - make export PROJECT=$GAME_NAME
 
   - name: artifact
     image: alpine
     environment:
-      <<: *environment
       DROPAREA_HOST: vps.teletype.hu
       DROPAREA_PORT: 2223
       DROPAREA_TARGET_PATH: /home/drop
@@ -23,17 +22,15 @@ steps:
       DROPAREA_SSH_PASSWORD:
         from_secret: droparea_ssh_password
     commands:
-      - apk add --no-cache openssh-client sshpass
+      - 'apk add --no-cache make openssh-client sshpass'
-      - mkdir -p /root/.ssh
+      - 'make ci-upload'
-      - sshpass -p $DROPAREA_SSH_PASSWORD scp -o StrictHostKeyChecking=no -P $DROPAREA_PORT $GAME_NAME.$GAME_LANG $GAME_NAME.tic $GAME_NAME.html.zip $DROPAREA_USER@$DROPAREA_HOST:$DROPAREA_TARGET_PATH
 
   - name: update
     image: alpine
     environment:
-      <<: *environment
       UPDATE_SERVER: https://games.vps.teletype.hu
       UPDATE_SECRET:
         from_secret: update_secret_key
     commands:
-      - apk add --no-cache curl
+      - 'apk add --no-cache make curl'
-      - curl "$UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80"
+      - 'make ci-update'

Makefile

@@ -1,15 +1,8 @@
 # -----------------------------------------
 # Makefile – TIC-80 project builder
-# Usage:
-#   make PROJECT=mranderson
-#   make build PROJECT=mranderson
-#   make watch PROJECT=mranderson
-#   make export PROJECT=mranderson
 # -----------------------------------------
 
-ifndef PROJECT
+PROJECT = mranderson
-$(error Specify the project name: make PROJECT=name)
-endif
 
 ORDER      = $(PROJECT).inc
 OUTPUT     = $(PROJECT).lua
@@ -17,30 +10,103 @@ OUTPUT_ZIP = $(PROJECT).html.zip
 OUTPUT_TIC = $(PROJECT).tic
 
 SRC_DIR    = inc
-SRC = $(shell sed 's|^|$(SRC_DIR)/|' $(ORDER))
+SRC        = $(shell sed 's|^|$(SRC_DIR)/|' $(ORDER))
+
+ASSETS_LUA = inc/meta/meta.assets.lua
+
+# CI/CD variables
+VERSION_FILE = .version
+GAME_LANG ?= lua
+DROPAREA_HOST ?= vps.teletype.hu
+DROPAREA_PORT ?= 2223
+DROPAREA_TARGET_PATH ?= /home/drop
+DROPAREA_USER ?= drop
+UPDATE_SERVER ?= https://games.vps.teletype.hu
 
 all: build
 
 build: $(OUTPUT)
-	@echo "==> Build complete: $(OUTPUT)"
 
 $(OUTPUT): $(SRC) $(ORDER)
-	@echo "==> Building $(OUTPUT)..."
 	@rm -f $(OUTPUT)
 	@while read f; do \
 		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
-		echo "\n" >> $(OUTPUT); \
+		echo "" >> $(OUTPUT); \
 	done < $(ORDER)
-	@echo "==> Done."
 
-export: $(OUTPUT)
+export: build
-	@echo "==> TIC-80 export..."
+	@if [ -z "$(VERSION)" ]; then \
-	tic80 --cli --skip --fs=. \
+		echo "ERROR: VERSION not set!"; \
-		--cmd="load $(OUTPUT) & save $(PROJECT) & export html $(PROJECT).html & exit"
+		exit 1; \
-	@echo "==> HTML ZIP: $(OUTPUT_ZIP)"
+	fi
-	@echo "==> TIC: $(OUTPUT_TIC)"
+	@echo "==> Exporting HTML for version $(VERSION)"
+	@tic80 --cli --skip --fs=. \
+		--cmd="load $(OUTPUT) & save $(PROJECT)-$(VERSION) & export html $(PROJECT)-$(VERSION).html & exit"
+	@echo "==> Creating versioned files"
+	@if [ -f "$(PROJECT)-$(VERSION).tic" ]; then \
+		cp $(PROJECT)-$(VERSION).tic $(PROJECT).tic; \
+	fi
+	@if [ -f "$(PROJECT)-$(VERSION).html.zip" ]; then \
+		cp $(PROJECT)-$(VERSION).html.zip $(PROJECT).html.zip; \
+	fi
+	@echo "==> Generated files:"
+	@ls -lh $(PROJECT)-$(VERSION).* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true
 
 watch:
-	@echo "==> Watching project: $(PROJECT)"
+	make build
-	make build PROJECT=$(PROJECT)
+	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do make build; done
-	fswatch -o $(SRC_DIR) $(ORDER) | while read; do make build PROJECT=$(PROJECT); done
+
+import_assets:
+	@for t in $(ASSET_TYPES); do \
+		for f in $(ASSETS_DIR)/$$t/*.png; do \
+			[ -e "$$f" ] || continue; \
+			echo "==> Importing $$f as $$t..."; \
+			tic80 --cli --skip --fs=. --cmd="import $$t $$f & exit"; \
+		done; \
+	done
+
+export_assets: build
+	@echo "==> Exporting TIC-80 asset sections"
+	@mkdir -p inc/meta
+	@sed -n '/^-- <PALETTE>/,/^-- <\/PALETTE>/p;\
+	         /^-- <TILES>/,/^-- <\/TILES>/p;\
+	         /^-- <SPRITES>/,/^-- <\/SPRITES>/p;\
+	         /^-- <MAP>/,/^-- <\/MAP>/p;\
+	         /^-- <SFX>/,/^-- <\/SFX>/p;\
+	         /^-- <MUSIC>/,/^-- <\/MUSIC>/p' \
+		$(OUTPUT) > $(ASSETS_LUA)
+
+clean:
+	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(OUTPUT)
+	@echo "==> Cleaned build artifacts"
+
+# CI/CD Targets
+ci-version:
+	@echo "==> Extracting version"
+	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
+	echo "VERSION is: $$VERSION"; \
+	echo $$VERSION > $(VERSION_FILE)
+
+ci-export:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Building and exporting version $$VERSION"; \
+	$(MAKE) export VERSION=$$VERSION
+
+ci-upload:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Uploading artifacts for version $$VERSION"; \
+	ls -lh $(PROJECT)-$$VERSION.* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true; \
+	cp $(PROJECT).lua $(PROJECT)-$$VERSION.lua; \
+	FILE_LUA=$(PROJECT)-$$VERSION.lua; \
+	FILE_TIC=$(PROJECT)-$$VERSION.tic; \
+	FILE_HTML_ZIP=$(PROJECT)-$$VERSION.html.zip; \
+	SCP_TARGET="$(DROPAREA_USER)@$(DROPAREA_HOST):$(DROPAREA_TARGET_PATH)/"; \
+	sshpass -p "$(DROPAREA_SSH_PASSWORD)" scp -o StrictHostKeyChecking=no -P $(DROPAREA_PORT) $$FILE_LUA $$FILE_TIC $$FILE_HTML_ZIP $$SCP_TARGET
+
+ci-update:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Triggering update for version $$VERSION"; \
+	curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=tic80&version=$$VERSION"
+
+.PHONY: all build export watch import_assets export_assets clean ci-version ci-export ci-upload ci-update
+