From f0570182b8f7591894ca2629953c28a8b9731764 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sun, 7 Jan 2024 18:08:41 +0100 Subject: [PATCH] do not hardcode the full version --- .forgejo/workflows/actions.yml | 21 ++++++++++++--------- actions/run.sh | 4 +++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/actions.yml b/.forgejo/workflows/actions.yml index 383eed3..70625a3 100644 --- a/.forgejo/workflows/actions.yml +++ b/.forgejo/workflows/actions.yml @@ -10,14 +10,17 @@ jobs: strategy: matrix: info: - - binary: https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 - version: v1_22 + - version: v1.22 + forgejo: https://codeberg.org + repo: forgejo-experimental/forgejo tests: ${{ vars.V1_22_TESTS }} - - binary: https://codeberg.org/forgejo/forgejo/releases/download/v1.21.3-0/forgejo-1.21.3-0-linux-amd64 - version: v1_21 + - version: v1.21 + forgejo: https://codeberg.org + repo: forgejo/forgejo tests: ${{ vars.V1_21_TESTS }} - - binary: https://codeberg.org/forgejo/forgejo/releases/download/v1.20.6-1/forgejo-1.20.6-1-linux-amd64 - version: v1_20 + - version: v1.20 + forgejo: https://codeberg.org + repo: forgejo/forgejo tests: ${{ vars.V1_20_TESTS }} steps: - uses: actions/checkout@v4 @@ -31,10 +34,10 @@ jobs: run: | set -x forgejo-binary.sh ensure_user forgejo - test "${{ matrix.info.binary }}" - test "${{ matrix.info.version }}" + full_version=$(curl -sS ${{ matrix.info.forgejo }}/api/v1/repos/${{ matrix.info.repo }}/releases | jq -r '.[] | .tag_name | select(startswith("${{ matrix.info.version }}"))' | sort -r | head -1) + binary=${{ matrix.info.forgejo }}/${{ matrix.info.repo }}/releases/download/${full_version}/forgejo-${full_version#v}-linux-amd64 export DIR=$(mktemp -d) chown forgejo $DIR /srv - su -c "actions/run.sh ${{ matrix.info.binary }} ${{ matrix.info.version }} ${{ matrix.info.tests }}" forgejo + su -c "actions/run.sh $binary $full_version ${{ matrix.info.version }} ${{ matrix.info.tests }}" forgejo diff --git a/actions/run.sh b/actions/run.sh index eee678a..4a1b8df 100755 --- a/actions/run.sh +++ b/actions/run.sh @@ -71,6 +71,8 @@ function teardown() { function main() { local binary="$1" shift + export full_version="$1" + shift export version="$1" shift @@ -79,7 +81,7 @@ function main() { teardown if test "$#" = 0 ; then - examples=$(examples_$version) + examples=$(examples_${version/./_}) else examples="$@" fi