pipeline fix
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

This commit is contained in:
2026-01-26 21:18:14 +01:00
parent 52b61543fd
commit fcbe9fbf59
2 changed files with 12 additions and 11 deletions

View File

@@ -6,9 +6,10 @@ steps:
- name: version - name: version
image: alpine image: alpine
commands: commands:
- "VERSION=$(sed -n 's/^-- version: //p' $GAME_NAME.$GAME_LANG | head -n 1)" - "VERSION=$(sed -n 's/^-- version: //p' $GAME_NAME.$GAME_LANG | head -n 1 | tr -d '[:space:]')"
- "echo VERSION is: $VERSION"
- "echo $VERSION > .version" - "echo $VERSION > .version"
- "echo Detected version: $VERSION" - "cat .version"
- name: build - name: build
image: git.teletype.hu/internal/tic80pro:latest image: git.teletype.hu/internal/tic80pro:latest
@@ -17,9 +18,10 @@ steps:
XDG_RUNTIME_DIR: /tmp XDG_RUNTIME_DIR: /tmp
commands: commands:
- "apt-get update && apt-get install -y zip" - "apt-get update && apt-get install -y zip"
- "VERSION=$(cat .version)" - "cat .version"
- "echo Building version $VERSION" - "export VERSION=$(cat .version)"
- "make build VERSION=$VERSION" - "echo Building version: $VERSION"
- "make build"
- "make export VERSION=$VERSION" - "make export VERSION=$VERSION"
- "echo Generated files:" - "echo Generated files:"
- "ls -lh $GAME_NAME-*.* $GAME_NAME.tic $GAME_NAME.html.zip" - "ls -lh $GAME_NAME-*.* $GAME_NAME.tic $GAME_NAME.html.zip"
@@ -37,7 +39,7 @@ steps:
commands: commands:
- "apk add --no-cache openssh-client sshpass" - "apk add --no-cache openssh-client sshpass"
- "mkdir -p /root/.ssh" - "mkdir -p /root/.ssh"
- "VERSION=$(cat .version)" - "export VERSION=$(cat .version)"
- "echo VERSION artifact step: $VERSION" - "echo VERSION artifact step: $VERSION"
- "echo SCP Target Path: $DROPAREA_TARGET_PATH/$GAME_NAME/$VERSION/" - "echo SCP Target Path: $DROPAREA_TARGET_PATH/$GAME_NAME/$VERSION/"
- "sshpass -p $DROPAREA_SSH_PASSWORD ssh -p $DROPAREA_PORT -o StrictHostKeyChecking=no $DROPAREA_USER@$DROPAREA_HOST mkdir -p $DROPAREA_TARGET_PATH/$GAME_NAME/$VERSION" - "sshpass -p $DROPAREA_SSH_PASSWORD ssh -p $DROPAREA_PORT -o StrictHostKeyChecking=no $DROPAREA_USER@$DROPAREA_HOST mkdir -p $DROPAREA_TARGET_PATH/$GAME_NAME/$VERSION"
@@ -55,6 +57,6 @@ steps:
from_secret: update_secret_key from_secret: update_secret_key
commands: commands:
- "apk add --no-cache curl" - "apk add --no-cache curl"
- "VERSION=$(cat .version)" - "export VERSION=$(cat .version)"
- "echo Triggering update for version $VERSION" - "echo Triggering update for version $VERSION"
- "curl $UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80&version=$VERSION" - "curl $UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80&version=$VERSION"

View File

@@ -14,9 +14,6 @@ SRC = $(shell sed 's|^|$(SRC_DIR)/|' $(ORDER))
ASSETS_LUA = inc/meta/meta.assets.lua ASSETS_LUA = inc/meta/meta.assets.lua
# VERSION lehet környezeti változó vagy extract-eljük a lua fájlból
VERSION ?= $(shell sed -n "s/^-- version: //p" $(OUTPUT) | head -n 1)
all: build all: build
build: $(OUTPUT) build: $(OUTPUT)
@@ -37,7 +34,9 @@ export: build
@tic80 --cli --skip --fs=. \ @tic80 --cli --skip --fs=. \
--cmd="load $(OUTPUT) & save $(PROJECT)-$(VERSION) & export html $(PROJECT)-$(VERSION).html & exit" --cmd="load $(OUTPUT) & save $(PROJECT)-$(VERSION) & export html $(PROJECT)-$(VERSION).html & exit"
@echo "==> Creating versioned files" @echo "==> Creating versioned files"
@cp $(PROJECT)-$(VERSION).tic $(PROJECT).tic @if [ -f "$(PROJECT)-$(VERSION).tic" ]; then \
cp $(PROJECT)-$(VERSION).tic $(PROJECT).tic; \
fi
@if [ -f "$(PROJECT)-$(VERSION).html.zip" ]; then \ @if [ -f "$(PROJECT)-$(VERSION).html.zip" ]; then \
cp $(PROJECT)-$(VERSION).html.zip $(PROJECT).html.zip; \ cp $(PROJECT)-$(VERSION).html.zip $(PROJECT).html.zip; \
fi fi