From 6f46ba7d49faff2b0e62a1628ed1a924d2178c01 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 27 Jul 2023 20:45:06 +0200 Subject: [PATCH] add tests for 1.20.1-0 and make it the default --- .forgejo/workflows/forgejo-sh.yml | 6 +++--- .forgejo/workflows/integration-nested.yml | 2 +- .forgejo/workflows/integration.yml | 2 +- README.md | 6 +++--- action.yml | 2 +- forgejo.sh | 2 +- testdata/sanity-checks/.forgejo/workflows/test.yml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/forgejo-sh.yml b/.forgejo/workflows/forgejo-sh.yml index 863c654..eca4d92 100644 --- a/.forgejo/workflows/forgejo-sh.yml +++ b/.forgejo/workflows/forgejo-sh.yml @@ -1,10 +1,10 @@ on: push: paths: - - forgejo.sh + - .forgejo/workflows/forgejo-sh.yml pull_request: paths: - - forgejo.sh + - .forgejo/workflows/forgejo-sh.yml jobs: forgejo-sh: @@ -14,7 +14,7 @@ jobs: - run: | set -x ./forgejo-dependencies.sh install_docker - for version in 1.19.3-0 ; do + for version in 1.19.4-0 1.20.1-0 ; do echo "=========================== launching forgejo v$version ==========" ./forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo $version ./forgejo.sh teardown diff --git a/.forgejo/workflows/integration-nested.yml b/.forgejo/workflows/integration-nested.yml index b03563d..b5292e0 100644 --- a/.forgejo/workflows/integration-nested.yml +++ b/.forgejo/workflows/integration-nested.yml @@ -7,7 +7,7 @@ jobs: - run: | set -x LXC_IP_PREFIX=10.0.9 ./forgejo-dependencies.sh - ./forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo 1.19 + ./forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo 1.20 # # Uncomment the following for a shortcut to debugging the Forgejo runner. # It will build the runner from a designated repository and branch instead of diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index bfd4bc5..e2df475 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -17,7 +17,7 @@ jobs: - run: | set -x LXC_IP_PREFIX=10.0.10 ./forgejo-dependencies.sh - ./forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo 1.19 + ./forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo 1.20 # # Uncomment the following for a shortcut to debugging the Forgejo runner. # It will build the runner from a designated repository and branch instead of diff --git a/README.md b/README.md index 043e615..05fc3ba 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ It can only be run on the `self-hosted` platform, running on a host with LXC ins | parameter | description | required | default | | --- | --- | --- | --- | | image | Container image | `false` | codeberg.org/forgejo/forgejo | -| image-version | Container image version | `false` | 1.19 | +| image-version | Container image version | `false` | 1.20 | | user | Administrator user name | `false` | root | | password | Administrator password | `false` | admin1234 | | runner | Runner git repository | `false` | https://code.forgejo.org/forgejo/runner | @@ -76,9 +76,9 @@ jobs: - id: forgejo uses: actions/setup-forgejo@v1 with: - image-version: 1.19 + image-version: 1.20 - run: | - curl ${{ steps.forgejo.outputs.url }}/api/forgejo/v1/version | grep 1.19 + curl ${{ steps.forgejo.outputs.url }}/api/forgejo/v1/version | grep 1.20 ``` diff --git a/action.yml b/action.yml index db98f2e..ef68d4c 100644 --- a/action.yml +++ b/action.yml @@ -37,7 +37,7 @@ inputs: default: 'codeberg.org/forgejo/forgejo' image-version: description: 'Container image version' - default: '1.19' + default: '1.20' user: description: 'Administrator user name' default: 'root' diff --git a/forgejo.sh b/forgejo.sh index 71d7905..911d34d 100755 --- a/forgejo.sh +++ b/forgejo.sh @@ -53,7 +53,7 @@ function setup() { local user="${1:-root}" local password="${2:-admin1234}" local image="${3:-codeberg.org/forgejo/forgejo}" - local version="${4:-1.19}" + local version="${4:-1.20}" run $image $version diff --git a/testdata/sanity-checks/.forgejo/workflows/test.yml b/testdata/sanity-checks/.forgejo/workflows/test.yml index bf72ef0..b527dc0 100644 --- a/testdata/sanity-checks/.forgejo/workflows/test.yml +++ b/testdata/sanity-checks/.forgejo/workflows/test.yml @@ -13,7 +13,7 @@ jobs: - id: forgejo uses: SELF@vTest with: - image-version: 1.19 + image-version: 1.20 - run: | echo +++++++++++++++++++++++++++++++++++++++++++ echo sanity checking the reset of setup-forgejo @@ -21,7 +21,7 @@ jobs: test "${{ steps.forgejo.outputs.token }}" test "FORGEJO_TOKEN" -a "FORGEJO_TOKEN" != F'O'RGEJO_TOKEN curl ${{ steps.forgejo.outputs.url }}/api/forgejo/v1/version >& version.out - if ! grep --quiet 1.19 version.out ; then + if ! grep --quiet 1.20 version.out ; then cat version.out exit 1 fi