Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Move runner-version check before signing

In the release-image.yml ordering I checked, this new Runner.Listener --version assertion runs only after the image digest and per-platform digests have already been signed and SBOM/SLSA attestations have been pushed. If build-image.sh builds with a stale RUNNER_VERSION override and publishes a deprecated runner under the new tag, this check will fail the workflow but leave a signed and attested bad image in GHCR. Run the per-platform version checks immediately after image_digest and before the cosign/attestation steps.

Useful? React with 👍 / 👎.


- 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:
Expand Down
2 changes: 1 addition & 1 deletion config/pools.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion src/lib/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/dockerfile.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions test/env.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
});
});

Expand Down
Loading