diff --git a/.forgejo/workflows/actions.yml b/.forgejo/workflows/actions.yml index a4f27a9..2c17002 100644 --- a/.forgejo/workflows/actions.yml +++ b/.forgejo/workflows/actions.yml @@ -10,7 +10,7 @@ # https://codeberg.org/forgejo-cascading-pr scope write:issue, write:repository, read:user # vars.CASCADE_DOCS_FORCE_VERSION # replace the generated documentation for a given version even if it has already -# been generated (e.g. v1.22.0-test) +# been generated (e.g. v7.0.0-test) # on: @@ -25,11 +25,11 @@ jobs: strategy: matrix: info: - - version: v1.22 + - version: v7.0 branch: next forgejo: https://codeberg.org repo: forgejo-experimental/forgejo - tests: ${{ vars.V1_22_TESTS }} + tests: ${{ vars.V7_0_TESTS }} - version: v1.21 forgejo: https://codeberg.org repo: forgejo/forgejo diff --git a/.forgejo/workflows/packages.yml b/.forgejo/workflows/packages.yml index 99e8072..fc59c92 100644 --- a/.forgejo/workflows/packages.yml +++ b/.forgejo/workflows/packages.yml @@ -10,11 +10,11 @@ jobs: strategy: matrix: info: - - version: v1.22 + - version: v7.0 branch: next forgejo: https://codeberg.org repo: forgejo-experimental/forgejo - tests: ${{ vars.V1_22_TESTS }} + tests: ${{ vars.V7_0_TESTS }} - version: v1.21 forgejo: https://codeberg.org repo: forgejo/forgejo @@ -38,4 +38,6 @@ jobs: export DIR=$(mktemp -d) chown forgejo $DIR /srv + export VERBOSE="${{ vars.VERBOSE || false }}" + su -c "packages/run.sh $binary $full_version ${{ matrix.info.version }} ${{ matrix.info.tests }}" forgejo diff --git a/README.md b/README.md index a458be0..9fefef9 100644 --- a/README.md +++ b/README.md @@ -61,19 +61,19 @@ fine when run as a regular user. Run one example ```sh -actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 cron # runs actions/example-cron +actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 cron # runs actions/example-cron ``` Cleanup. It will teardown Forgejo & the runner and not run them because there is nothing to test. ```sh -actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 none +actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 none ``` -Run all examples for v1_22 +Run all examples for v7_0 ```sh -actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 +actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 ``` Run from sources @@ -91,7 +91,7 @@ the number of cases run by the **none** they are not run at all for that version of Forgejo. If it does not exist, all tests are run. -* `V1_22_TESTS` +* `v7_0_TESTS` * `V1_21_TESTS` * `V1_20_TESTS` @@ -102,18 +102,18 @@ To run and debug package tests, from the root of the source directory. Run one test ```sh -packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 alpine # runs packages/alpine.sh +packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 alpine # runs packages/alpine.sh ``` Cleanup. It will teardown Forgejo and not run them because there is nothing to test. ```sh -packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 none +packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 none ``` -Run all examples for v1_22 +Run all examples for v7_0 ```sh -packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 +packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 ``` Remote testing @@ -124,5 +124,5 @@ the number of cases run by the **none** they are not run at all for that version of Forgejo. If it does not exist, all tests are run. -* `V1_22_PACKAGES_TESTS` +* `v7_0_PACKAGES_TESTS` * `V1_21_PACKAGES_TESTS` diff --git a/actions/run.sh b/actions/run.sh index b40cc68..ab8b86b 100755 --- a/actions/run.sh +++ b/actions/run.sh @@ -38,7 +38,7 @@ function examples_v1_21() { echo 'echo push tag push-cancel artifacts service checkout pull-request container expression local-action context docker-action if if-fail cron' } -function examples_v1_22() { +function examples_v7_0() { examples_v1_21 } diff --git a/forgejo/sources/1.22 b/forgejo/sources/1.22 deleted file mode 100644 index 985576e..0000000 --- a/forgejo/sources/1.22 +++ /dev/null @@ -1 +0,0 @@ -https://codeberg.org/forgejo/forgejo forgejo 7.0.0+0-gitea-1.22.0 diff --git a/forgejo/sources/7.0 b/forgejo/sources/7.0 new file mode 100644 index 0000000..32da8fd --- /dev/null +++ b/forgejo/sources/7.0 @@ -0,0 +1 @@ +https://codeberg.org/forgejo/forgejo forgejo 7.0.0+gitea-1.22.0 diff --git a/forgejo/upgrades/test-upgrade.sh b/forgejo/upgrades/test-upgrade.sh index cfbb946..a848163 100755 --- a/forgejo/upgrades/test-upgrade.sh +++ b/forgejo/upgrades/test-upgrade.sh @@ -65,8 +65,8 @@ function dependencies() { } function build_all() { - log_info 1.22.0-dev - $SELF_DIR/../build.sh 1.22.0-dev $DIR + log_info 7.0.0-dev + $SELF_DIR/../build.sh 7.0.0-dev $DIR } function retry() { diff --git a/packages/run.sh b/packages/run.sh index 2a8f991..7a0a62e 100755 --- a/packages/run.sh +++ b/packages/run.sh @@ -16,7 +16,7 @@ function packages_v1_21() { echo 'alpine' } -function packages_v1_22() { +function packages_v7_0() { packages_v1_21 } @@ -68,6 +68,10 @@ function main() { echo "======================== FAIL package-$package ===================" sleep 5 # hack for Forgejo v1.21 to workaround a bug by which the last lines of the output are moved to the next step false + else + if test "$VERBOSE" = true ; then + sed -e 's/^/[RUN] /' < /tmp/run.out + fi fi echo "======================== END package-$package ===================" done