From efb633bec978427c8dfb45d95261ea336e30de92 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 30 May 2023 15:16:16 +0200 Subject: [PATCH] replace ubuntu-latest with docker for clarity --- forgejo-runner.sh | 2 +- testdata/demo/.forgejo/workflows/test.yml | 2 +- testdata/example-container/.forgejo/workflows/test.yml | 2 +- testdata/example-echo/.forgejo/workflows/test.yml | 2 +- testdata/example-service/.forgejo/workflows/test.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forgejo-runner.sh b/forgejo-runner.sh index a42254e..292aa9f 100755 --- a/forgejo-runner.sh +++ b/forgejo-runner.sh @@ -24,7 +24,7 @@ function download() { function register() { local forgejo="$1" docker exec --user 1000 forgejo forgejo actions generate-runner-token > forgejo-runner-token - timeout --signal=KILL 30 forgejo-runner register --no-interactive --instance "$forgejo" --name runner --token $(cat forgejo-runner-token) --labels ubuntu-latest:docker://node:16-buster,self-hosted + timeout --signal=KILL 30 forgejo-runner register --no-interactive --instance "$forgejo" --name runner --token $(cat forgejo-runner-token) --labels docker:docker://node:16-bullseye,ubuntu-latest:docker://node:16-buster,self-hosted } function run() { diff --git a/testdata/demo/.forgejo/workflows/test.yml b/testdata/demo/.forgejo/workflows/test.yml index bd05c51..11654b9 100644 --- a/testdata/demo/.forgejo/workflows/test.yml +++ b/testdata/demo/.forgejo/workflows/test.yml @@ -1,7 +1,7 @@ on: [push] jobs: ls: - runs-on: ubuntu-latest + runs-on: docker steps: - uses: actions/checkout@v3 - run: | diff --git a/testdata/example-container/.forgejo/workflows/test.yml b/testdata/example-container/.forgejo/workflows/test.yml index f4903a3..6385e42 100644 --- a/testdata/example-container/.forgejo/workflows/test.yml +++ b/testdata/example-container/.forgejo/workflows/test.yml @@ -1,7 +1,7 @@ on: [push] jobs: test: - runs-on: ubuntu-latest + runs-on: docker container: image: alpine:3.18 steps: diff --git a/testdata/example-echo/.forgejo/workflows/test.yml b/testdata/example-echo/.forgejo/workflows/test.yml index 6010460..d470cda 100644 --- a/testdata/example-echo/.forgejo/workflows/test.yml +++ b/testdata/example-echo/.forgejo/workflows/test.yml @@ -1,6 +1,6 @@ on: [push] jobs: test: - runs-on: ubuntu-latest + runs-on: docker steps: - run: echo All Good diff --git a/testdata/example-service/.forgejo/workflows/test.yml b/testdata/example-service/.forgejo/workflows/test.yml index 68e6505..44379b1 100644 --- a/testdata/example-service/.forgejo/workflows/test.yml +++ b/testdata/example-service/.forgejo/workflows/test.yml @@ -2,7 +2,7 @@ on: [push] jobs: test: - runs-on: ubuntu-latest + runs-on: docker services: pgsql: