From a34fc370c5e4d42987d96dc283c582939a78ef55 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sat, 26 Jul 2025 05:52:33 +0200 Subject: [PATCH] fix(ci): no need to test for overrides twice --- .../.forgejo/workflows/test.yml | 19 ++++--------------- .../upload-dir-v3/file1-v3.txt | 1 + .../upload-dir-v3/file2-v3.txt | 1 + 3 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 testdata/upload-download/upload-dir-v3/file1-v3.txt create mode 100644 testdata/upload-download/upload-dir-v3/file2-v3.txt diff --git a/testdata/upload-download/.forgejo/workflows/test.yml b/testdata/upload-download/.forgejo/workflows/test.yml index 6dbd3db..e80296e 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') }} @@ -52,20 +52,9 @@ jobs: direction: upload tag: a/v3.0 token: FORGEJO_TEST_TOKEN - release-dir: upload-dir + release-dir: upload-dir-v3 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_TEST_TOKEN - release-dir: upload-dir - hide-archive-link: true - override: true - verbose: true - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} id: release-download uses: SELF@vTest @@ -97,11 +86,11 @@ jobs: direction: download tag: a/v3.0 token: FORGEJO_TEST_TOKEN - release-dir: download-dir-v3a + release-dir: download-dir-v3 download-latest: true 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