diff --git a/.forgejo/workflows/end-to-end.yml b/.forgejo/workflows/end-to-end.yml index 58e2197..12e13d6 100644 --- a/.forgejo/workflows/end-to-end.yml +++ b/.forgejo/workflows/end-to-end.yml @@ -72,6 +72,9 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/prepare-end-to-end - run: su forgejo -c "./end-to-end.sh test_actions" + - name: full logs + if: always() + run: su forgejo -c "./end-to-end.sh show_logs" actions-docs: needs: [build] @@ -123,9 +126,6 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/prepare-end-to-end - - name: skip if S3 cache hit - if: steps.S3.outputs.cache-hit != 'true' - run: echo no hit - run: su forgejo -c "./end-to-end.sh test_upgrades" - run: su forgejo -c "./end-to-end.sh test_storage" - name: full logs diff --git a/lib/ORGANIZATIONS b/lib/ORGANIZATIONS new file mode 100644 index 0000000..8c8989a --- /dev/null +++ b/lib/ORGANIZATIONS @@ -0,0 +1 @@ +forgejo forgejo-experimental forgejo-integration diff --git a/lib/lib.sh b/lib/lib.sh index 853a4f2..2d1be2e 100644 --- a/lib/lib.sh +++ b/lib/lib.sh @@ -35,6 +35,7 @@ export DOT=$DOT_FORGEJO_CURL # for backward compatibility with forgejo-curl.sh 1 : ${FORGEJO_USER:=root} : ${FORGEJO_PASSWORD:=admin1234} RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)" +ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS) function log_info() { echo "$PREFIX $@" @@ -116,7 +117,7 @@ function download() { if ! test -f $DIR_BINARIES/forgejo-$version ; then mkdir -p $DIR_BINARIES - for owner in forgejo forgejo-experimental forgejo-integration ; do + for owner in $ORGANIZATIONS ; do full_version=$(full_version $version $owner) if test "$full_version" = "" ; then continue