earl-warren/end-to-end
2
1
Fork 0
Code Issues 3 Pull requests 13 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Forgejo v1.22 will actually be Forgejo v7.0' (#91) from earl-warren/end-to-end:wip-alpine into main

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/end-to-end/pulls/91
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
This commit is contained in:
earl-warren 2024-02-28 17:07:43 +00:00
parent d885c84bbe 78027e672d
commit cff067a118
8 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/actions.yml
View file

@ -10,7 +10,7 @@
# https://codeberg.org/forgejo-cascading-pr scope write:issue, write:repository, read:user # https://codeberg.org/forgejo-cascading-pr scope write:issue, write:repository, read:user
# vars.CASCADE_DOCS_FORCE_VERSION # vars.CASCADE_DOCS_FORCE_VERSION
# replace the generated documentation for a given version even if it has already # replace the generated documentation for a given version even if it has already
# been generated (e.g. v1.22.0-test) # been generated (e.g. v7.0.0-test)
# #
on: on:
@ -25,11 +25,11 @@ jobs:
strategy: strategy:
matrix: matrix:
info: info:
- version: v1.22 - version: v7.0
branch: next branch: next
forgejo: https://codeberg.org forgejo: https://codeberg.org
repo: forgejo-experimental/forgejo repo: forgejo-experimental/forgejo
tests: ${{ vars.V1_22_TESTS }} tests: ${{ vars.V7_0_TESTS }}
- version: v1.21 - version: v1.21
forgejo: https://codeberg.org forgejo: https://codeberg.org
repo: forgejo/forgejo repo: forgejo/forgejo

6
.forgejo/workflows/packages.yml
View file

@ -10,11 +10,11 @@ jobs:
strategy: strategy:
matrix: matrix:
info: info:
- version: v1.22 - version: v7.0
branch: next branch: next
forgejo: https://codeberg.org forgejo: https://codeberg.org
repo: forgejo-experimental/forgejo repo: forgejo-experimental/forgejo
tests: ${{ vars.V1_22_TESTS }} tests: ${{ vars.V7_0_TESTS }}
- version: v1.21 - version: v1.21
forgejo: https://codeberg.org forgejo: https://codeberg.org
repo: forgejo/forgejo repo: forgejo/forgejo
@ -38,4 +38,6 @@ jobs:
export DIR=$(mktemp -d) export DIR=$(mktemp -d)
chown forgejo $DIR /srv chown forgejo $DIR /srv
export VERBOSE="${{ vars.VERBOSE || false }}"
su -c "packages/run.sh $binary $full_version ${{ matrix.info.version }} ${{ matrix.info.tests }}" forgejo su -c "packages/run.sh $binary $full_version ${{ matrix.info.version }} ${{ matrix.info.tests }}" forgejo

20
README.md
View file

@ -61,19 +61,19 @@ fine when run as a regular user.
Run one example Run one example
```sh ```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.0-test v1_22 cron # runs actions/example-cron actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 cron # runs actions/example-cron
``` ```
Cleanup. It will teardown Forgejo & the runner and not run them because there is nothing to test. Cleanup. It will teardown Forgejo & the runner and not run them because there is nothing to test.
```sh ```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.0-test v1_22 none actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 none
``` ```
Run all examples for v1_22 Run all examples for v7_0
```sh ```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.0-test v1_22 actions/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0
``` ```
Run from sources Run from sources
@ -91,7 +91,7 @@ the number of cases run by the
**none** they are not run at all for that version of Forgejo. If **none** they are not run at all for that version of Forgejo. If
it does not exist, all tests are run. it does not exist, all tests are run.
* `V1_22_TESTS` * `v7_0_TESTS`
* `V1_21_TESTS` * `V1_21_TESTS`
* `V1_20_TESTS` * `V1_20_TESTS`
@ -102,18 +102,18 @@ To run and debug package tests, from the root of the source directory.
Run one test Run one test
```sh ```sh
packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 alpine # runs packages/alpine.sh packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 alpine # runs packages/alpine.sh
``` ```
Cleanup. It will teardown Forgejo and not run them because there is nothing to test. Cleanup. It will teardown Forgejo and not run them because there is nothing to test.
```sh ```sh
packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 none packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0 none
``` ```
Run all examples for v1_22 Run all examples for v7_0
```sh ```sh
packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 v1.22.0-test v1_22 packages/run.sh https://codeberg.org/forgejo-experimental/forgejo/releases/download/v7.0.0-test/forgejo-7.0.0-test-linux-amd64 v7.0.0-test v7_0
``` ```
Remote testing Remote testing
@ -124,5 +124,5 @@ the number of cases run by the
**none** they are not run at all for that version of Forgejo. If **none** they are not run at all for that version of Forgejo. If
it does not exist, all tests are run. it does not exist, all tests are run.
* `V1_22_PACKAGES_TESTS` * `v7_0_PACKAGES_TESTS`
* `V1_21_PACKAGES_TESTS` * `V1_21_PACKAGES_TESTS`

2
actions/run.sh
View file

@ -38,7 +38,7 @@ function examples_v1_21() {
echo 'echo push tag push-cancel artifacts service checkout pull-request container expression local-action context docker-action if if-fail cron' echo 'echo push tag push-cancel artifacts service checkout pull-request container expression local-action context docker-action if if-fail cron'
} }
function examples_v1_22() { function examples_v7_0() {
examples_v1_21 examples_v1_21
} }

1
forgejo/sources/1.22
View file

@ -1 +0,0 @@
https://codeberg.org/forgejo/forgejo forgejo 7.0.0+0-gitea-1.22.0

1
forgejo/sources/7.0 Normal file
View file

@ -0,0 +1 @@
https://codeberg.org/forgejo/forgejo forgejo 7.0.0+gitea-1.22.0

4
forgejo/upgrades/test-upgrade.sh
View file

@ -65,8 +65,8 @@ function dependencies() {
} }
function build_all() { function build_all() {
log_info 1.22.0-dev log_info 7.0.0-dev
$SELF_DIR/../build.sh 1.22.0-dev $DIR $SELF_DIR/../build.sh 7.0.0-dev $DIR
} }
function retry() { function retry() {

6
packages/run.sh
View file

@ -16,7 +16,7 @@ function packages_v1_21() {
echo 'alpine' echo 'alpine'
} }
function packages_v1_22() { function packages_v7_0() {
packages_v1_21 packages_v1_21
} }
@ -68,6 +68,10 @@ function main() {
echo "======================== FAIL package-$package ===================" echo "======================== FAIL package-$package ==================="
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 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 false
else
if test "$VERBOSE" = true ; then
sed -e 's/^/[RUN] /' < /tmp/run.out
fi
fi fi
echo "======================== END package-$package ===================" echo "======================== END package-$package ==================="
done done