diff --git a/forgejo-release.sh b/forgejo-release.sh index 73b8e7b..1216ded 100755 --- a/forgejo-release.sh +++ b/forgejo-release.sh @@ -19,6 +19,8 @@ if ${VERBOSE:-false}; then set -x; fi : ${RETRY:=1} : ${DELAY:=10} +RELEASE_NOTES_ASSISTANT_VERSION=v1.3.3 # renovate: datasource=forgejo-releases depName=forgejo/release-notes-assistant registryUrl=https://code.forgejo.org + TAG_FILE="$TMP_DIR/tag$$.json" TAG_URL=$(echo "$TAG" | sed 's/\//%2F/g') @@ -116,7 +118,7 @@ release_draft() { maybe_use_release_note_assistant() { if "$RELEASE_NOTES_ASSISTANT"; then - curl --fail -s -S -o rna https://code.forgejo.org/forgejo/release-notes-assistant/releases/download/v1.2.3/release-notes-assistant + curl --fail -s -S -o rna https://code.forgejo.org/forgejo/release-notes-assistant/releases/download/$RELEASE_NOTES_ASSISTANT_VERSION/release-notes-assistant chmod +x ./rna ./rna --storage release --storage-location "$TAG" --forgejo-url "$SCHEME"://placeholder:"$TOKEN"@"$HOST" --repository $REPO --token "$TOKEN" release "$TAG" fi diff --git a/testdata/upload-download/.forgejo/workflows/gpg-no-passphrase.yml b/testdata/upload-download/.forgejo/workflows/gpg-no-passphrase.yml index 5ab367f..a0cf926 100644 --- a/testdata/upload-download/.forgejo/workflows/gpg-no-passphrase.yml +++ b/testdata/upload-download/.forgejo/workflows/gpg-no-passphrase.yml @@ -98,7 +98,7 @@ jobs: uses: SELF@vTest with: direction: upload - tag: v1.2 + tag: v1.3 token: FORGEJO_TEST_TOKEN release-dir: upload-dir release-notes: "RELEASE NOTES" @@ -109,7 +109,7 @@ jobs: uses: SELF@vTest with: direction: download - tag: v1.2 + tag: v1.3 token: FORGEJO_TEST_TOKEN release-dir: download-dir verbose: true diff --git a/testdata/upload-download/.forgejo/workflows/test.yml b/testdata/upload-download/.forgejo/workflows/test.yml index 6254a27..e77982e 100644 --- a/testdata/upload-download/.forgejo/workflows/test.yml +++ b/testdata/upload-download/.forgejo/workflows/test.yml @@ -4,7 +4,7 @@ name: Upload (and download) a release to (and from) the project that runs the wo on: [push] jobs: upload-download: - runs-on: self-hosted + runs-on: lxc-bookworm steps: - uses: actions/checkout@v4 - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} @@ -45,28 +45,6 @@ jobs: - \backslash escape - !exclamation_mark verbose: true - - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} - id: release-upload-slash-in-tag - uses: SELF@vTest - with: - direction: upload - tag: a/v3.0 - token: FORGEJO_TOKEN - release-dir: upload-dir - release-notes: "RELEASE NOTES" - verbose: true - - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} - id: release-upload-override-slash-in-tag - uses: SELF@vTest - with: - direction: upload - tag: a/v3.0 - token: FORGEJO_TOKEN - release-dir: upload-dir - release-notes-assistant: true - hide-archive-link: true - override: true - verbose: true - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} id: release-download uses: SELF@vTest @@ -91,18 +69,28 @@ jobs: - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} run: | diff -u upload-dir-v2 download-dir-v2 + + - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} + id: release-upload-slash-in-tag + uses: SELF@vTest + with: + direction: upload + tag: v/3.0 + token: FORGEJO_TEST_TOKEN + release-dir: upload-dir-v3 + release-notes: "RELEASE NOTES" + verbose: true - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} id: release-download-with-slash-in-tag uses: SELF@vTest with: direction: download - tag: a/v3.0 + tag: v/3.0 token: FORGEJO_TEST_TOKEN - release-dir: download-dir-v3a - download-latest: true + release-dir: download-dir-v3 verbose: true - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} run: | - diff -u upload-dir download-dir-v3a + diff -u upload-dir-v3 download-dir-v3 - if: failure() run: docker logs forgejo diff --git a/testdata/upload-download/upload-dir-v3/file1-v3.txt b/testdata/upload-download/upload-dir-v3/file1-v3.txt new file mode 100644 index 0000000..d6c6b5f --- /dev/null +++ b/testdata/upload-download/upload-dir-v3/file1-v3.txt @@ -0,0 +1 @@ +FILE1-V3 diff --git a/testdata/upload-download/upload-dir-v3/file2-v3.txt b/testdata/upload-download/upload-dir-v3/file2-v3.txt new file mode 100644 index 0000000..9fa78bc --- /dev/null +++ b/testdata/upload-download/upload-dir-v3/file2-v3.txt @@ -0,0 +1 @@ +FILE2-V3