From fd0b64850f386fa3971660b18ae9aec04df84c70 Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Thu, 6 Aug 2026 08:16:47 +0200 Subject: [PATCH] Serve the tic80 pipeline on the existing tic80pro image --- apps/api/config/initializers/warp_engine.rb | 8 +++----- .../warp_engine/ci_templates/tic80.yaml.erb | 20 ++++++++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/api/config/initializers/warp_engine.rb b/apps/api/config/initializers/warp_engine.rb index c540cde..df4b3b4 100644 --- a/apps/api/config/initializers/warp_engine.rb +++ b/apps/api/config/initializers/warp_engine.rb @@ -10,17 +10,15 @@ Rails.application.config.to_prepare do # Woodpecker configuration extension (/build/config): the served platforms # and their builder images. An image bump is one line here, rolled out to - # every repo by the deploy. tic80 can be added once the tic80-builder image - # (lua+luacheck+ldoc toolchain) exists in the tic80-tools repo. + # every repo by the deploy. c.ci_platforms = { "godot" => { builder: "git.teletypegames.org/internal/godot-builder:4.7.1" }, "phaser" => { builder: "git.teletypegames.org/internal/phaser-builder:latest" }, "love" => { builder: "git.teletypegames.org/internal/love-builder:latest" }, "bevy" => { builder: "git.teletypegames.org/internal/bevy-builder:latest" }, "c64" => { builder: "git.teletypegames.org/internal/c64-builder:latest" }, - "ebitengine" => { builder: "git.teletypegames.org/internal/ebitengine-builder:latest" } - # "tic80" => { builder: "git.teletypegames.org/internal/tic80-builder:latest", - # exporter: "git.teletypegames.org/internal/tic80pro:latest" } + "ebitengine" => { builder: "git.teletypegames.org/internal/ebitengine-builder:latest" }, + "tic80" => { builder: "git.teletypegames.org/internal/tic80pro:latest" } } c.ci_extension_public_key_url = "https://ci.teletypegames.org/api/signature/public-key" diff --git a/libs/ruby/warp_engine/lib/warp_engine/ci_templates/tic80.yaml.erb b/libs/ruby/warp_engine/lib/warp_engine/ci_templates/tic80.yaml.erb index eb86f78..37f0aa6 100644 --- a/libs/ruby/warp_engine/lib/warp_engine/ci_templates/tic80.yaml.erb +++ b/libs/ruby/warp_engine/lib/warp_engine/ci_templates/tic80.yaml.erb @@ -17,8 +17,12 @@ steps: echo $VERSION > .version - name: lint - image: <%= builder %> + image: alpine commands: + - apk add --no-cache lua5.4 lua5.4-dev luarocks gcc musl-dev + - ln -sf /usr/bin/lua5.4 /usr/bin/lua + - ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks + - luarocks install luacheck - | echo "==> Merging..." rm -f /tmp/_lint_combined.lua /tmp/_lint_map.txt @@ -83,8 +87,10 @@ steps: rm -f /tmp/_lint_combined.lua /tmp/_lint_map.txt - name: minify - image: <%= builder %> + image: alpine commands: + - apk add --no-cache lua5.4 curl + - ln -sf /usr/bin/lua5.4 /usr/bin/lua - | rm -f <%= name %>.lua sed 's/\r$//' <%= name %>.inc | while read f; do @@ -97,8 +103,12 @@ steps: lua minify.lua minify <%= name %>.original.lua > <%= name %>.lua - name: docs - image: <%= builder %> + image: alpine commands: + - apk add --no-cache lua5.4 lua5.4-dev luarocks gcc musl-dev zip + - ln -sf /usr/bin/lua5.4 /usr/bin/lua + - ln -sf /usr/bin/luarocks-5.4 /usr/bin/luarocks + - luarocks install ldoc - | VERSION=$(cat .version) echo "==> Generating docs from <%= name %>.original.lua" @@ -109,7 +119,7 @@ steps: echo "==> Docs zip created" - name: export - image: <%= exporter %> + image: <%= builder %> environment: XDG_RUNTIME_DIR: /tmp commands: @@ -128,7 +138,7 @@ steps: ls -lh <%= name %>-$VERSION.* <%= name %>.tic <%= name %>.html.zip 2>/dev/null || true - name: binaries - image: <%= exporter %> + image: <%= builder %> environment: XDG_RUNTIME_DIR: /tmp commands: