1
0
Fork 0
mirror of https://code.forgejo.org/actions/setup-forgejo synced 2024-09-19 18:06:17 +00:00

Merge pull request 'upgrade the runner to v1.7.0' (#17) from earl-warren/setup-forgejo:wip-1.7.0 into main

Reviewed-on: https://code.forgejo.org/actions/setup-forgejo/pulls/17
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
This commit is contained in:
earl-warren 2023-04-30 22:43:23 +00:00
commit fd145b4da2
4 changed files with 8 additions and 3 deletions

View file

@ -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 | | user | Administrator user name | `false` | root |
| password | Administrator password | `false` | admin1234 | | password | Administrator password | `false` | admin1234 |
| runner | Runner git repository | `false` | https://code.forgejo.org/forgejo/runner | | 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 | | 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 | | lxc-ip-prefix | Class C IP prefix used by LXC | `false` | 10.0.23 |
<!-- action-docs-inputs --> <!-- action-docs-inputs -->

View file

@ -49,7 +49,7 @@ inputs:
default: 'https://code.forgejo.org/forgejo/runner' default: 'https://code.forgejo.org/forgejo/runner'
runner-version: runner-version:
description: 'Runner version' description: 'Runner version'
default: 'v1.6.0' default: 'v1.7.0'
container: container:
description: 'Name of the container running the Forgejo instance' description: 'Name of the container running the Forgejo instance'
default: 'forgejo' default: 'forgejo'

View file

@ -34,7 +34,7 @@ function run() {
function setup() { function setup() {
local runner_repository="${1:-https://code.forgejo.org/forgejo/runner}" 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/}" local forgejo="${3:-http://$(cat forgejo-ip):3000/}"
dependencies dependencies

View file

@ -6,12 +6,17 @@ jobs:
setup-forgejo: setup-forgejo:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
- run: |
echo +++++++++++++++++++++++++++++++++++++++++++
echo about to actions/checkout@v3 for SELF@vTest
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- id: forgejo - id: forgejo
uses: SELF@vTest uses: SELF@vTest
with: with:
image-version: 1.19 image-version: 1.19
- run: | - run: |
echo +++++++++++++++++++++++++++++++++++++++++++
echo sanity checking the reset of setup-forgejo
set -ex set -ex
test "${{ steps.forgejo.outputs.token }}" test "${{ steps.forgejo.outputs.token }}"
test "FORGEJO_TOKEN" -a "FORGEJO_TOKEN" != F'O'RGEJO_TOKEN test "FORGEJO_TOKEN" -a "FORGEJO_TOKEN" != F'O'RGEJO_TOKEN