pipeline fix

.woodpecker.yml

@@ -9,8 +9,14 @@ steps:
       <<: *environment
       XDG_RUNTIME_DIR: /tmp
     commands:
+      - apk add --no-cache zip
       - make build
       - make export
+      - VERSION=$(sed -n 's/^-- version: //p' ${GAME_NAME}.${GAME_LANG} | head -n 1)
+      - echo "VERSION (build step): $VERSION"
+      - zip -r ${GAME_NAME}.html.zip "$VERSION"
+      - ls -al
+      - echo $VERSION > .version
 
   - name: artifact
     image: alpine
@@ -25,7 +31,12 @@ steps:
     commands:
       - apk add --no-cache openssh-client sshpass
       - mkdir -p /root/.ssh
-      - 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
+      - VERSION=$(cat .version)
+      - echo "VERSION (artifact step): $VERSION"
+      - echo "SCP Target Path: $DROPAREA_TARGET_PATH/$GAME_NAME/$VERSION/"
+      - sshpass -p $DROPAREA_SSH_PASSWORD ssh -p $DROPAREA_PORT $DROPAREA_USER@$DROPAREA_HOST "mkdir -p $DROPAREA_TARGET_PATH/$GAME_NAME/$VERSION"
+      - ls -al
+      - 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/$GAME_NAME/$VERSION/
 
   - name: update
     image: alpine
@@ -36,4 +47,5 @@ steps:
         from_secret: update_secret_key
     commands:
       - apk add --no-cache curl
-      - curl "$UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80"
+      - VERSION=$(cat .version)
+      - curl "$UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80&version=$VERSION"

Makefile

@@ -19,8 +19,8 @@ all: build
 build: $(OUTPUT)
 
 $(OUTPUT): $(SRC) $(ORDER)
-	@rm -f $(OUTPUT)
+	 @rm -f $(OUTPUT)
-	@while read f; do \
+	 @while read f; do \
 		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
 		echo "" >> $(OUTPUT); \
 	done < $(ORDER)
@@ -46,8 +46,13 @@ export_assets: build
 		$(OUTPUT) > $(ASSETS_LUA)
 
 export: build
-	tic80 --cli --skip --fs=. \
+	@{ \
-		--cmd="load $(OUTPUT) & save $(PROJECT) & export html $(PROJECT).html & exit"
+	    VERSION=$$(sed -n 's/^-- version: //p' $(OUTPUT) | head -n 1); \
+	    echo "==> Exporting HTML for version $$VERSION"; \
+	    mkdir -p "$$VERSION"; \
+	    tic80 --cli --skip --fs=. \
+		    --cmd="load $(OUTPUT) & save $(PROJECT) & export html $$VERSION/$(PROJECT).html & exit"; \
+	}
 
 watch:
 	make build