From 79d373b859d814ad61440a2fe26f692f0af881e4 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 20 Dec 2023 16:59:50 +0100 Subject: [PATCH 1/4] update hacking instructions --- README.md | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3cdff14..f85ed11 100644 --- a/README.md +++ b/README.md @@ -27,23 +27,25 @@ git clone https://code.forgejo.org/actions/setup-forgejo export PATH=$(pwd)/setup-forgejo:$PATH git clone https://code.forgejo.org/forgejo/end-to-end cd end-to-end -forgejo-curl.sh logout -forgejo-runner.sh teardown -forgejo.sh teardown -forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo 1.21 -forgejo-runner.sh setup -export url=http://root:admin1234@$(cat forgejo-ip):3000 -export token=$(cat forgejo-token) +export DIR=/tmp/end-to-end ``` -### Run a single test + +Run one example ```sh -export example=pull-request -export EXAMPLE_DIR=$(pwd)/actions/example-$example -sudo rm -fr /srv/example-$example ; mkdir /srv/example-$example -$EXAMPLE_DIR/setup.sh -$EXAMPLE_DIR/run.sh -forgejo-test-helper.sh run_workflow actions/example-$example http://root:admin1234@$(cat forgejo-ip):3000 root example-$example setup-forgejo $(cat forgejo-token) +actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1_22 cron # runs actions/example-cron +``` + +Cleanup + +```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 none +``` + +Run all examples for v1_22 + +```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 ``` ### Remote testing @@ -54,5 +56,6 @@ 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` * `V1_21_TESTS` * `V1_20_TESTS` From 665da23a488e4398ea9b619bf7371ea0d84152e0 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 20 Dec 2023 17:59:05 +0100 Subject: [PATCH 2/4] actions: rework to use binaries instead of docker images --- .forgejo/workflows/actions.yml | 63 ++++++---------------- actions/run.sh | 96 ++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 46 deletions(-) create mode 100755 actions/run.sh diff --git a/.forgejo/workflows/actions.yml b/.forgejo/workflows/actions.yml index 8ef74fc..5024749 100644 --- a/.forgejo/workflows/actions.yml +++ b/.forgejo/workflows/actions.yml @@ -10,60 +10,31 @@ jobs: strategy: matrix: info: - - version: "1.21" - image: codeberg.org/forgejo/forgejo - # keep "cron" last otherwise it will linger and pollute the following runs - tests: "${{ vars.V1_21_TESTS || 'echo push-cancel artifacts service checkout pull-request container expression local-action docker-action if if-fail cron' }}" - - version: "1.20" - image: codeberg.org/forgejo/forgejo - tests: "${{ vars.V1_20_TESTS || 'echo checkout service container expression local-action docker-action if if-fail' }}" + - binary: https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 + version: v1_22 + tests: ${{ vars.V1_22_TESTS }} + - binary: https://codeberg.org/forgejo/forgejo/releases/download/v1.21.2-1/forgejo-1.21.2-1-linux-amd64 + version: v1_21 + tests: ${{ vars.V1_21_TESTS }} + - binary: https://codeberg.org/forgejo/forgejo/releases/download/v1.20.6-1/forgejo-1.20.6-1-linux-amd64 + version: v1_20 + tests: ${{ vars.V1_20_TESTS }} steps: - uses: actions/checkout@v4 - - uses: https://code.forgejo.org/actions/setup-forgejo@v1 + - uses: https://code.forgejo.org/actions/setup-forgejo@v2 with: install-only: true - if: matrix.info.tests != 'none' shell: bash run: | - forgejo.sh setup root admin1234 ${{ matrix.info.image }} ${{ matrix.info.version }} - forgejo-runner.sh setup - export FORGEJO_RUNNER_LOGS=forgejo-runner.log - export url=http://root:admin1234@$(cat forgejo-ip):3000 - export token=$(cat forgejo-token) + set -x + forgejo-binary.sh ensure_user forgejo + test "${{ matrix.info.binary }}" + test "${{ matrix.info.version }}" - function run() { - local example=$1 + export DIR=$(mktemp -d) + chown forgejo $DIR /srv - export example - export EXAMPLE_DIR=$(pwd)/actions/example-$example - - if test -f $EXAMPLE_DIR/setup.sh ; then - echo "============================ SETUP example-$example ===================" - bash -ex $EXAMPLE_DIR/setup.sh || return 1 - fi - - if test -f $EXAMPLE_DIR/run.sh ; then - echo "============================ RUN example-$example ===================" - bash -ex $EXAMPLE_DIR/run.sh || return 1 - else - forgejo-test-helper.sh run_workflow actions/example-$example $url root example-$example setup-forgejo $token || return 1 - fi - - if test -f $EXAMPLE_DIR/teardown.sh ; then - echo "============================ TEARDOWN example-$example ===================" - bash -ex $EXAMPLE_DIR/teardown.sh || return 1 - fi - } - - for example in ${{ matrix.info.tests }} ; do - echo "============================ BEGIN example-$example ===================" - if ! time run $example >& /tmp/run.out ; then - cat /tmp/run.out - echo "============================ FAIL example-$example ===================" - sleep 5 # hack for Forgejo v1.21 to workaround a but by which the last lines of the output are moved to the next step - false - fi - echo "============================ END example-$example ===================" - done + su -c "actions/run.sh ${{ matrix.info.binary }} ${{ matrix.info.version }} ${{ matrix.info.tests }}" forgejo diff --git a/actions/run.sh b/actions/run.sh new file mode 100755 index 0000000..717682d --- /dev/null +++ b/actions/run.sh @@ -0,0 +1,96 @@ +#!/bin/bash + +set -e + +function run() { + local example=$1 + + export example + export EXAMPLE_DIR=$(pwd)/actions/example-$example + + if test -f $EXAMPLE_DIR/setup.sh ; then + echo "============================ SETUP example-$example ===================" + bash -ex $EXAMPLE_DIR/setup.sh || return 1 + fi + + if test -f $EXAMPLE_DIR/run.sh ; then + echo "============================ RUN example-$example ===================" + bash -ex $EXAMPLE_DIR/run.sh || return 1 + else + forgejo-test-helper.sh run_workflow actions/example-$example $url root example-$example setup-forgejo $token || return 1 + fi + + if test -f $EXAMPLE_DIR/teardown.sh ; then + echo "============================ TEARDOWN example-$example ===================" + bash -ex $EXAMPLE_DIR/teardown.sh || return 1 + fi +} + +function examples_v1_20() { + echo 'echo checkout service container expression local-action docker-action if if-fail' +} + +function examples_v1_21() { + # keep "cron" last otherwise it will linger and pollute the following runs + echo 'echo push-cancel artifacts service checkout pull-request container expression local-action docker-action if if-fail cron' +} + +function examples_v1_22() { + examples_v1_21 +} + +function setup() { + local binary=$1 + forgejo-binary.sh setup root admin1234 $binary + forgejo-runner.sh setup +} + +function teardown() { + forgejo-curl.sh logout + forgejo-runner.sh teardown + forgejo-binary.sh teardown +} + +function main() { + local binary="$1" + shift + export version="$1" + shift + + export DOT=$DIR/forgejo-curl + + teardown + + if test "$#" = 0 ; then + examples=$(examples_$version) + else + examples="$@" + fi + + if test "$examples" = "none" ; then + exit 0 + fi + + setup $binary + + if ! test -f "$DIR/forgejo-auth-url" ; then + echo "DIR=$DIR must be a directory with a forgejo-auth-url file" + fi + + export FORGEJO_RUNNER_LOGS=$DIR/forgejo-runner.log + export url=$(cat $DIR/forgejo-auth-url) + export token=$(cat $DIR/forgejo-token) + + for example in $examples ; do + echo "======================== BEGIN example-$example ===================" + if ! time run $example >& /tmp/run.out ; then + cat /tmp/run.out + echo "======================== FAIL example-$example ===================" + 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 + fi + echo "======================== END example-$example ===================" + done +} + +main "$@" From 13283ea0c34cb2a2a8954cabc5a8047054f09bdf Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 20 Dec 2023 17:59:31 +0100 Subject: [PATCH 3/4] actions/example-cron: fix for local usage --- actions/example-cron/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actions/example-cron/setup.sh b/actions/example-cron/setup.sh index db8208f..ee70b92 100755 --- a/actions/example-cron/setup.sh +++ b/actions/example-cron/setup.sh @@ -1,2 +1,3 @@ -mkdir /srv/example-cron-volume +rm -fr /srv/example-cron-volume +mkdir -p /srv/example-cron-volume FORGEJO_RUNNER_CONFIG=$EXAMPLE_DIR/runner-config.yaml forgejo-runner.sh reload From 8358ff237259cf19825060ae30b5b0c494a1f7e7 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 20 Dec 2023 22:50:08 +0100 Subject: [PATCH 4/4] actions/example-pull-request: cleanup /srv/example-pull-request --- actions/example-pull-request/setup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/actions/example-pull-request/setup.sh b/actions/example-pull-request/setup.sh index f2c4556..e93087e 100755 --- a/actions/example-pull-request/setup.sh +++ b/actions/example-pull-request/setup.sh @@ -1,2 +1,8 @@ +if test $(id -u) != 0 ; then + SUDO=sudo +fi + +$SUDO rm -fr /srv/example-pull-request/{root,fork-org} +rm -fr /srv/example-pull-request mkdir -p /srv/example-pull-request FORGEJO_RUNNER_CONFIG=$EXAMPLE_DIR/runner-config.yaml forgejo-runner.sh reload