nm17/end-to-end
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'lib: ORGANIZATIONS ordered list' (#118) from twenty-panda/end-to-end:wip-actions into main

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/end-to-end/pulls/118
Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>
This commit is contained in:
earl-warren 2024-03-20 19:14:52 +00:00
commit c461ace62b
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/end-to-end.yml
View file

@ -72,6 +72,9 @@ jobs:
- uses: https://code.forgejo.org/actions/checkout@v4 - uses: https://code.forgejo.org/actions/checkout@v4
- uses: ./.forgejo/prepare-end-to-end - uses: ./.forgejo/prepare-end-to-end
- run: su forgejo -c "./end-to-end.sh test_actions" - 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: actions-docs:
needs: [build] needs: [build]
@ -123,9 +126,6 @@ jobs:
steps: steps:
- uses: https://code.forgejo.org/actions/checkout@v4 - uses: https://code.forgejo.org/actions/checkout@v4
- uses: ./.forgejo/prepare-end-to-end - 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_upgrades"
- run: su forgejo -c "./end-to-end.sh test_storage" - run: su forgejo -c "./end-to-end.sh test_storage"
- name: full logs - name: full logs

1
lib/ORGANIZATIONS Normal file
View file

@ -0,0 +1 @@
forgejo forgejo-experimental forgejo-integration

3
lib/lib.sh
View file

@ -35,6 +35,7 @@ export DOT=$DOT_FORGEJO_CURL # for backward compatibility with forgejo-curl.sh 1
: ${FORGEJO_USER:=root} : ${FORGEJO_USER:=root}
: ${FORGEJO_PASSWORD:=admin1234} : ${FORGEJO_PASSWORD:=admin1234}
RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)" RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)"
ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS)
function log_info() { function log_info() {
echo "$PREFIX $@" echo "$PREFIX $@"
@ -116,7 +117,7 @@ function download() {
if ! test -f $DIR_BINARIES/forgejo-$version ; then if ! test -f $DIR_BINARIES/forgejo-$version ; then
mkdir -p $DIR_BINARIES mkdir -p $DIR_BINARIES
for owner in forgejo forgejo-experimental forgejo-integration ; do for owner in $ORGANIZATIONS ; do
full_version=$(full_version $version $owner) full_version=$(full_version $version $owner)
if test "$full_version" = "" ; then if test "$full_version" = "" ; then
continue continue