From ccc0561393f0141c1d959ecb12d900de4ab019a7 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 1 May 2023 00:25:52 +0200 Subject: [PATCH 1/2] make it easier to spot the logs in the output --- testdata/sanity-checks/.forgejo/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testdata/sanity-checks/.forgejo/workflows/test.yml b/testdata/sanity-checks/.forgejo/workflows/test.yml index bc8e798..f09e670 100644 --- a/testdata/sanity-checks/.forgejo/workflows/test.yml +++ b/testdata/sanity-checks/.forgejo/workflows/test.yml @@ -6,12 +6,17 @@ jobs: setup-forgejo: runs-on: self-hosted steps: + - run: | + echo +++++++++++++++++++++++++++++++++++++++++++ + echo about to actions/checkout@v3 for SELF@vTest - uses: actions/checkout@v3 - id: forgejo uses: SELF@vTest with: image-version: 1.19 - run: | + echo +++++++++++++++++++++++++++++++++++++++++++ + echo sanity checking the reset of setup-forgejo set -ex test "${{ steps.forgejo.outputs.token }}" test "FORGEJO_TOKEN" -a "FORGEJO_TOKEN" != F'O'RGEJO_TOKEN From 894556e7a26a59ec69233a7829607bc137332f23 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 1 May 2023 00:26:55 +0200 Subject: [PATCH 2/2] upgrade the runner to v1.7.0 --- README.md | 2 +- action.yml | 2 +- forgejo-runner.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9fe1233..c25530b 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ It can only be run on the `self-hosted` platform, running on a host with LXC ins | user | Administrator user name | `false` | root | | password | Administrator password | `false` | admin1234 | | runner | Runner git repository | `false` | https://code.forgejo.org/forgejo/runner | -| runner-version | Runner version | `false` | v1.6.0 | +| runner-version | Runner version | `false` | v1.7.0 | | container | Name of the container running the Forgejo instance | `false` | forgejo | | lxc-ip-prefix | Class C IP prefix used by LXC | `false` | 10.0.23 | diff --git a/action.yml b/action.yml index 6810c79..839bf65 100644 --- a/action.yml +++ b/action.yml @@ -49,7 +49,7 @@ inputs: default: 'https://code.forgejo.org/forgejo/runner' runner-version: description: 'Runner version' - default: 'v1.6.0' + default: 'v1.7.0' container: description: 'Name of the container running the Forgejo instance' default: 'forgejo' diff --git a/forgejo-runner.sh b/forgejo-runner.sh index d7783a5..8e2fcf3 100755 --- a/forgejo-runner.sh +++ b/forgejo-runner.sh @@ -34,7 +34,7 @@ function run() { function setup() { local runner_repository="${1:-https://code.forgejo.org/forgejo/runner}" - local version="${2:-v1.6.0}" + local version="${2:-v1.7.0}" local forgejo="${3:-http://$(cat forgejo-ip):3000/}" dependencies