[CI] simplify running end-to-end tests while building a release

This commit is contained in:
Earl Warren 2024-03-20 20:20:42 +01:00
parent 89f8d33127
commit 03aebc4b0f
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 12 additions and 4 deletions

View file

@ -9,4 +9,14 @@ forgejo_ref=$4
cd $end_to_end cd $end_to_end
date > last-upgrade date > last-upgrade
echo $FORGEJO_BINARY > forgejo/binary-url organizations=lib/ORGANIZATIONS
if ! test -f $organizations ; then
echo "$organizations file not found"
false
fi
#
# do not include forgejo-experimental so that 7.0-test is found
# in forgejo-integration where it was just built instead of
# forgejo-experimental which was published by the previous build
#
echo forgejo forgejo-integration > $organizations

View file

@ -203,11 +203,9 @@ jobs:
destination-url: https://code.forgejo.org destination-url: https://code.forgejo.org
destination-fork-repo: ${{ vars.CASCADE_DESTINATION_DOER }}/end-to-end destination-fork-repo: ${{ vars.CASCADE_DESTINATION_DOER }}/end-to-end
destination-repo: forgejo/end-to-end destination-repo: forgejo/end-to-end
destination-branch: forgejo-pr destination-branch: main
destination-token: ${{ secrets.CASCADE_DESTINATION_TOKEN }} destination-token: ${{ secrets.CASCADE_DESTINATION_TOKEN }}
update: .forgejo/cascading-release-end-to-end update: .forgejo/cascading-release-end-to-end
env:
FORGEJO_BINARY: "${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/releases/download/v${{ steps.release-info.outputs.version }}/forgejo-${{ steps.release-info.outputs.version }}-linux-amd64"
- name: copy to experimental - name: copy to experimental
if: vars.ROLE == 'forgejo-integration' && secrets.TOKEN != '' if: vars.ROLE == 'forgejo-integration' && secrets.TOKEN != ''