From 069735deb12529c8cfb4ad0fdccfe949eba25504 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sat, 2 Sep 2023 07:42:49 +0200 Subject: [PATCH] upgrade tests to 1.20 --- .forgejo/workflows/integration.yml | 10 +++++----- .../nested-upload-download/.forgejo/workflows/test.yml | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index 54b2ce8..ab0e4c7 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -10,23 +10,23 @@ jobs: with: user: testuser password: admin1234 - image-version: 1.19 + image-version: 1.20 - - name: Make the forgejo-release action available for testing + - name: push self run: | forgejo-test-helper.sh push_self_action http://testuser:admin1234@${{ steps.forgejo.outputs.host-port }} testuser forgejo-release vTest - - name: Actions tests from testdata/upload-download/.forgejo/workflows + - name: testdata/upload-download run: | export FORGEJO_RUNNER_LOGS="${{ steps.forgejo.outputs.runner-logs }}" forgejo-test-helper.sh run_workflow testdata/upload-download http://testuser:admin1234@${{ steps.forgejo.outputs.host-port }} testuser upload-download forgejo-release "${{ steps.forgejo.outputs.token }}" - - name: Actions tests from testdata/nested-upload-download/.forgejo/workflows + - name: testdata/nested-upload-download run: | export FORGEJO_RUNNER_LOGS="${{ steps.forgejo.outputs.runner-logs }}" forgejo-test-helper.sh run_workflow testdata/nested-upload-download http://testuser:admin1234@${{ steps.forgejo.outputs.host-port }} testuser nested-upload-download forgejo-release "${{ steps.forgejo.outputs.token }}" - - name: Integration tests of the supporting script forgejo-release.sh + - name: test forgejo-release.sh run: | set -ex export FORGEJO="${{ steps.forgejo.outputs.url }}" diff --git a/testdata/nested-upload-download/.forgejo/workflows/test.yml b/testdata/nested-upload-download/.forgejo/workflows/test.yml index 44b1107..bef2bd4 100644 --- a/testdata/nested-upload-download/.forgejo/workflows/test.yml +++ b/testdata/nested-upload-download/.forgejo/workflows/test.yml @@ -1,6 +1,10 @@ # SPDX-License-Identifier: MIT -name: Upload (and download) a release to (and from) a project found in a Forgejo instance that is different from the one running the workflow +# +# Upload (and download) a release to (and from) a project +# found in a Forgejo instance that is different from the one running the workflow +# +name: two Forgejo on: [push] jobs: setup-forgejo: @@ -13,6 +17,7 @@ jobs: user: testuser password: admin1234 lxc-ip-prefix: 10.0.15 + image-version: 1.20 - id: testrepo run: | forgejo-test-helper.sh push testrepo http://testuser:admin1234@${{ steps.forgejo.outputs.host-port }} testuser testrepo > /tmp/output