From 00cd95d17458f0e7a6ac9f303000c212dac86e79 Mon Sep 17 00:00:00 2001 From: Pheidon Date: Sun, 31 May 2026 20:46:32 +0000 Subject: [PATCH] fix: upgrade bundled actions runner --- .github/workflows/release-image.yml | 4 ++-- config/pools.yaml | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.windows | 2 +- package.json | 2 +- scripts/build-image.sh | 2 +- src/lib/env.ts | 2 +- test/dockerfile.test.ts | 2 +- test/env.test.ts | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml index 49f2324..71c796e 100644 --- a/.github/workflows/release-image.yml +++ b/.github/workflows/release-image.yml @@ -213,11 +213,11 @@ jobs: - run: | docker run --rm --platform linux/amd64 --entrypoint /bin/sh "${{ steps.release_meta.outputs.image_ref }}" -lc \ - 'command -v pgrep && pgrep --version | head -n 1 && docker --version && node --version && python3 --version && terraform version | head -n 1' + 'test "$(cd /actions-runner && ./bin/Runner.Listener --version)" = "2.334.0" && command -v pgrep && pgrep --version | head -n 1 && docker --version && node --version && python3 --version && terraform version | head -n 1' - run: | docker run --rm --platform linux/arm64 --entrypoint /bin/sh "${{ steps.release_meta.outputs.image_ref }}" -lc \ - 'command -v pgrep && pgrep --version | head -n 1 && docker --version && node --version && python3 --version && terraform version | head -n 1' + 'test "$(cd /actions-runner && ./bin/Runner.Listener --version)" = "2.334.0" && command -v pgrep && pgrep --version | head -n 1 && docker --version && node --version && python3 --version && terraform version | head -n 1' - if: ${{ github.event_name == 'push' || inputs.publish_project_release }} env: diff --git a/config/pools.yaml b/config/pools.yaml index f7409bb..3863c30 100644 --- a/config/pools.yaml +++ b/config/pools.yaml @@ -1,7 +1,7 @@ version: 1 image: repository: ghcr.io/omt-global/github-runner-fleet - tag: 0.2.0 + tag: 0.2.1 pools: - key: synology-private visibility: private diff --git a/docker/Dockerfile b/docker/Dockerfile index 6b36afb..bfdd4e9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETPLATFORM python:3.12-slim-bookworm ARG TARGETARCH -ARG RUNNER_VERSION=2.333.0 +ARG RUNNER_VERSION=2.334.0 ARG NODE_VERSION=18.20.8 ARG TERRAFORM_VERSION=1.6.6 diff --git a/docker/Dockerfile.windows b/docker/Dockerfile.windows index 756436d..0d5a77d 100644 --- a/docker/Dockerfile.windows +++ b/docker/Dockerfile.windows @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 -ARG RUNNER_VERSION=2.333.0 +ARG RUNNER_VERSION=2.334.0 SHELL ["powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command"] diff --git a/package.json b/package.json index d0dd2d3..d82b129 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "github-runner-fleet", - "version": "0.2.0", + "version": "0.2.1", "private": true, "license": "MIT", "description": "Self-hosted GitHub runner fleet for Synology shell-only pools, Linux Docker hosts, and ephemeral Lume macOS VMs.", diff --git a/scripts/build-image.sh b/scripts/build-image.sh index dfcf691..b7de16c 100755 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -43,7 +43,7 @@ while [[ $# -gt 0 ]]; do esac done -: "${RUNNER_VERSION:=2.333.0}" +: "${RUNNER_VERSION:=2.334.0}" : "${NODE_VERSION:=18.20.8}" : "${TERRAFORM_VERSION:=1.6.6}" diff --git a/src/lib/env.ts b/src/lib/env.ts index b6f8655..ba63d93 100644 --- a/src/lib/env.ts +++ b/src/lib/env.ts @@ -192,7 +192,7 @@ export function loadDeploymentEnv( : undefined; const composeProjectName = merged.COMPOSE_PROJECT_NAME || "github-runner-fleet"; - const runnerVersion = normalizeRunnerVersion(merged.RUNNER_VERSION || "2.333.0"); + const runnerVersion = normalizeRunnerVersion(merged.RUNNER_VERSION || "2.334.0"); return { githubPat, diff --git a/test/dockerfile.test.ts b/test/dockerfile.test.ts index 2318f71..8775611 100644 --- a/test/dockerfile.test.ts +++ b/test/dockerfile.test.ts @@ -47,7 +47,7 @@ describe("Dockerfile packaging", () => { ); expect(dockerfile).toContain("mcr.microsoft.com/windows/servercore:ltsc2022"); - expect(dockerfile).toContain("ARG RUNNER_VERSION=2.333.0"); + expect(dockerfile).toContain("ARG RUNNER_VERSION=2.334.0"); expect(dockerfile).toContain("choco install -y git nodejs-lts powershell-core"); expect(dockerfile).toContain("actions-runner-win-x64-"); expect(dockerfile).toContain("COPY docker/runner-entrypoint.ps1 C:/runner-entrypoint.ps1"); diff --git a/test/env.test.ts b/test/env.test.ts index ef22247..70bcd0e 100644 --- a/test/env.test.ts +++ b/test/env.test.ts @@ -55,7 +55,7 @@ describe("loadDeploymentEnv", () => { expect(env.githubApiUrl).toBe("https://api.github.com"); expect(env.composeProjectName).toBe("github-runner-fleet"); - expect(env.runnerVersion).toBe("2.333.0"); + expect(env.runnerVersion).toBe("2.334.0"); expect(env.githubPat).toBeUndefined(); expect(env.raw).toMatchObject({ GITHUB_API_URL: "https://api.github.com", @@ -82,7 +82,7 @@ describe("loadDeploymentEnv", () => { LUME_RUNNER_BASE_DIR: `${os.homedir()}/Library/Application Support/github-runner-fleet/lume`, LUME_RUNNER_ENV_FILE: `${os.homedir()}/Library/Application Support/github-runner-fleet/lume/runner.env`, COMPOSE_PROJECT_NAME: "github-runner-fleet", - RUNNER_VERSION: "2.333.0" + RUNNER_VERSION: "2.334.0" }); });