From 442aa69f0a29102e3bd4c6ae9b4080c153bc4cca Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Sat, 22 Feb 2025 17:06:24 +0100 Subject: [PATCH] chore(renovate): normalize versions as a preliminary step Get rid of the ancient Forgejo numbering scheme to facilitate the crafting of renovate regular expressions to unify version updates. --- .forgejo/workflows/integration-action.yml | 2 +- .forgejo/workflows/integration-scripts.yml | 8 ++++---- README.md | 6 +++--- action.yml | 2 +- forgejo-binary.sh | 2 +- forgejo-lib.sh | 2 +- forgejo.sh | 2 +- .../lxc-run-forgejo-binary/.forgejo/workflows/test.yml | 4 ++-- testdata/lxc-run-forgejo-oci/.forgejo/workflows/test.yml | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.forgejo/workflows/integration-action.yml b/.forgejo/workflows/integration-action.yml index 04b16cf..e24311f 100644 --- a/.forgejo/workflows/integration-action.yml +++ b/.forgejo/workflows/integration-action.yml @@ -17,7 +17,7 @@ jobs: run: | LXC_IP_PREFIX=10.0.9 ./forgejo-dependencies.sh export PATH=$(pwd):$PATH - forgejo.sh setup root admin1234 code.forgejo.org/forgejo/forgejo 1.20 + forgejo.sh setup root admin1234 code.forgejo.org/forgejo/forgejo 7.0 forgejo-runner.sh setup echo "============================ upload setup-forgejo ===================" forgejo-test-helper.sh push_self_action $(cat forgejo-auth-url) root setup-forgejo vTest diff --git a/.forgejo/workflows/integration-scripts.yml b/.forgejo/workflows/integration-scripts.yml index 1fd0d2a..b3cfb9f 100644 --- a/.forgejo/workflows/integration-scripts.yml +++ b/.forgejo/workflows/integration-scripts.yml @@ -39,10 +39,10 @@ jobs: strategy: matrix: binary: - - version: 1.21.2-1 - file: https://code.forgejo.org/forgejo/forgejo/releases/download/v1.21.2-1/forgejo-1.21.2-1-linux-amd64 - - version: 1.20.6-1 - file: https://code.forgejo.org/forgejo/forgejo/releases/download/v1.20.6-1/forgejo-1.20.6-1-linux-amd64 + - version: 10.0.1 + file: https://code.forgejo.org/forgejo/forgejo/releases/download/v10.0.1/forgejo-10.0.1-linux-amd64 + - version: 7.0.13 + file: https://code.forgejo.org/forgejo/forgejo/releases/download/v7.0.13/forgejo-7.0.13-linux-amd64 steps: - uses: actions/checkout@v4 - shell: bash diff --git a/README.md b/README.md index 560a466..76dbe21 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ that [provides a LXC container](https://forgejo.org/docs/next/user/actions/#jobs | parameter | description | required | default | | --- | --- | --- | --- | | image | Container image | `false` | code.forgejo.org/forgejo/forgejo | -| image-version | Container image version | `false` | 1.20 | +| image-version | Container image version | `false` | 7.0 | | binary | URL to a Forgejo binary | `false` | | | user | Administrator user name | `false` | root | | password | Administrator password | `false` | admin1234 | @@ -85,9 +85,9 @@ jobs: - id: forgejo uses: actions/setup-forgejo@v1 with: - image-version: 1.20 + image-version: 7.0 - run: | - curl ${{ steps.forgejo.outputs.url }}/api/forgejo/v1/version | grep 1.20 + curl ${{ steps.forgejo.outputs.url }}/api/forgejo/v1/version | grep 7.0 ``` diff --git a/action.yml b/action.yml index e83fdb5..8e1fe40 100644 --- a/action.yml +++ b/action.yml @@ -40,7 +40,7 @@ inputs: default: 'code.forgejo.org/forgejo/forgejo' image-version: description: 'Container image version' - default: '1.20' + default: '7.0' binary: description: 'URL to a Forgejo binary' user: diff --git a/forgejo-binary.sh b/forgejo-binary.sh index e86a509..bbdf73b 100755 --- a/forgejo-binary.sh +++ b/forgejo-binary.sh @@ -104,7 +104,7 @@ function teardown() { function setup() { local user="${1:-root}" local password="${2:-admin1234}" - local url="${3:-https://code.forgejo.org/forgejo/forgejo/releases/download/v1.21.2-1/forgejo-1.21.2-1-linux-amd64}" + local url="${3:-https://code.forgejo.org/forgejo/forgejo/releases/download/v7.0.13/forgejo-7.0.13-linux-amd64}" dependencies download "$url" diff --git a/forgejo-lib.sh b/forgejo-lib.sh index 54cb749..fe4c2e7 100644 --- a/forgejo-lib.sh +++ b/forgejo-lib.sh @@ -51,7 +51,7 @@ function stop_daemon() { } function dependency_go() { - go_version="1.21.4.linux-amd64" # Set the desired Go version here + go_version="1.24.0.linux-amd64" # Set the desired Go version here if ! which wget tar >/dev/null; then apt-get install -y -qq wget tar diff --git a/forgejo.sh b/forgejo.sh index aae1614..f99f457 100755 --- a/forgejo.sh +++ b/forgejo.sh @@ -44,7 +44,7 @@ function setup() { local user="${1:-root}" local password="${2:-admin1234}" local image="${3:-codeberg.org/forgejo/forgejo}" - local version="${4:-1.20}" + local version="${4:-7.0}" run $image $version diff --git a/testdata/lxc-run-forgejo-binary/.forgejo/workflows/test.yml b/testdata/lxc-run-forgejo-binary/.forgejo/workflows/test.yml index e4597b4..9b2ce4b 100644 --- a/testdata/lxc-run-forgejo-binary/.forgejo/workflows/test.yml +++ b/testdata/lxc-run-forgejo-binary/.forgejo/workflows/test.yml @@ -11,7 +11,7 @@ jobs: - id: forgejo uses: SELF@vTest with: - binary: https://code.forgejo.org/forgejo/forgejo/releases/download/v1.20.6-1/forgejo-1.20.6-1-linux-amd64 + binary: https://code.forgejo.org/forgejo/forgejo/releases/download/v7.0.13/forgejo-7.0.13-linux-amd64 - run: | echo +++++++++++++++++++++++++++++++++++++++++++ echo sanity checking the reset of setup-forgejo @@ -19,7 +19,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.20 version.out ; then + if ! grep --quiet 7.0 version.out ; then cat version.out exit 1 fi diff --git a/testdata/lxc-run-forgejo-oci/.forgejo/workflows/test.yml b/testdata/lxc-run-forgejo-oci/.forgejo/workflows/test.yml index ed3a4b2..882a46c 100644 --- a/testdata/lxc-run-forgejo-oci/.forgejo/workflows/test.yml +++ b/testdata/lxc-run-forgejo-oci/.forgejo/workflows/test.yml @@ -13,7 +13,7 @@ jobs: - id: forgejo uses: SELF@vTest with: - image-version: 1.20 + image-version: 7.0 - 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.20 version.out ; then + if ! grep --quiet 7.0 version.out ; then cat version.out exit 1 fi