diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index 8e2b422..c8c5f1e 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -5,7 +5,7 @@ on: - "**" env: - FORGEJO_VERSION: 11.0.10 # renovate: datasource=docker depName=data.forgejo.org/forgejo/forgejo + FORGEJO_VERSION: 11.0.10 # renovate: datasource=docker depName=code.forgejo.org/forgejo/forgejo jobs: integration: @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v6 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v3.1.3 + uses: https://code.forgejo.org/actions/setup-forgejo@v3.1.1 with: user: testuser password: admin1234 diff --git a/README.md b/README.md index f73f620..e2ae420 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ jobs: runs-on: docker steps: - uses: actions/checkout@v4 - - uses: actions/forgejo-release@v2.9.1 + - uses: actions/forgejo-release@v2.8.0 with: direction: upload url: https://my-forgejo-instance.net @@ -64,7 +64,7 @@ jobs: runs-on: docker steps: - uses: actions/checkout@v4 - - uses: actions/forgejo-release@v2.9.1 + - uses: actions/forgejo-release@v2.8.0 with: direction: download url: https://my-forgejo-instance.net diff --git a/forgejo-release.sh b/forgejo-release.sh index 88539b1..22bdbab 100755 --- a/forgejo-release.sh +++ b/forgejo-release.sh @@ -18,7 +18,6 @@ if ${VERBOSE:-false}; then set -x; fi : ${HIDE_ARCHIVE_LINK:=false} : ${RETRY:=1} : ${DELAY:=10} -: ${SKIP_ASSETS:=false} RELEASE_NOTES_ASSISTANT_VERSION=v1.5.1 # renovate: datasource=forgejo-releases depName=forgejo/release-notes-assistant registryUrl=https://code.forgejo.org @@ -85,7 +84,7 @@ upload_release() { # It is expanded using "${assets[@]}" which preserves the separation of arguments and not split whitespace containing values. # For reference, see https://github.com/koalaman/shellcheck/wiki/SC2086#exceptions local assets=() - if [ "$SKIP_ASSETS" == 'false' ]; then + if ! "$SKIP_ASSETS"; then for file in "$RELEASE_DIR"/*; do assets=("${assets[@]}" -a "$file") done @@ -210,7 +209,7 @@ download() { ( mkdir -p $RELEASE_DIR cd $RELEASE_DIR - if [[ ${DOWNLOAD_LATEST} = "true" ]]; then + if [[ ${DOWNLOAD_LATEST} == "true" ]]; then echo "Downloading the latest release" api GET repos/$REPO/releases/latest >"$TMP_DIR"/assets.json elif [[ ${DOWNLOAD_LATEST} == "false" ]]; then diff --git a/testdata/nested-upload-download/.forgejo/workflows/test.yml b/testdata/nested-upload-download/.forgejo/workflows/test.yml index 2ebfbe7..29d118d 100644 --- a/testdata/nested-upload-download/.forgejo/workflows/test.yml +++ b/testdata/nested-upload-download/.forgejo/workflows/test.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v6 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v3.1.3 + uses: https://code.forgejo.org/actions/setup-forgejo@v3.1.1 with: user: testuser password: admin1234