Merge pull request 'various minor fixes' (#134) from earl-warren/end-to-end:wip-fixes into main

Reviewed-on: https://code.forgejo.org/forgejo/end-to-end/pulls/134

actions/example-pull-request/run.sh

@@ -3,7 +3,7 @@ export d=/srv/example/pull-request
 
 PROOF='some proof'
 
-function setup() {
+function main() {
     mkdir -p $d
 
     forgejo-test-helper.sh push_workflow actions/example-$example $url root example-$example setup-forgejo $token
@@ -54,8 +54,4 @@ function setup() {
     done
 }
 
-function main() {
-    setup
-}
-
 main

actions/example-push-cancel/run.sh

@@ -13,6 +13,6 @@ forgejo-test-helper.sh wait_running $url $repo $sha
 #
 forgejo-test-helper.sh push_workflow actions/example-$example $url root example-$example setup-forgejo $token
 #
-# wait for the workflow to be canceld as a result of the previous push
+# wait for the workflow to be canceled as a result of the previous push
 #
 forgejo-test-helper.sh wait_failure $url $repo $sha 'Has been cancelled'