gitea v1.21 -> forgejo 7.0.2 -> forgejo 10.0.3

.forgejo/workflows/end-to-end.yml

@@ -60,95 +60,6 @@ jobs:
           name: forgejo-dev
           path: /tmp/forgejo-upload
 
-  packages:
-    needs: [build]
-    runs-on: lxc-bookworm
-    steps:
-      - uses: https://data.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/prepare-end-to-end
-      - run: su forgejo -c "./end-to-end.sh test_packages"
-      - name: full logs
-        if: always()
-        run: su forgejo -c "./end-to-end.sh show_logs"
-
-  actions:
-    needs: [build]
-    runs-on: lxc-bookworm
-    steps:
-      - uses: https://data.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/prepare-end-to-end
-      - run: ./end-to-end.sh prepare_dockerd
-      - 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"
-
-  federation:
-    needs: [build]
-    runs-on: lxc-bookworm
-    steps:
-      - uses: https://data.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/prepare-end-to-end
-      - name: install zstd
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          apt-get -q install -y -qq zstd
-      - name: cache GitLab OCI image
-        uses: https://data.forgejo.org/actions/cache@v4
-        with:
-          path: |
-            /srv/forgejo-binaries/gitlab
-          key: gitlab
-      - run: |
-          su forgejo -c "./end-to-end.sh test_federation"
-      - name: full logs
-        if: always()
-        run: su forgejo -c "./end-to-end.sh show_logs"
-
-  actions-docs:
-    needs: [build]
-    runs-on: lxc-bookworm
-    if: github.ref == 'refs/heads/main'
-    strategy:
-      matrix:
-        info:
-          - version: "11.0"
-            branch: next
-            forgejo: https://codeberg.org
-            owner: forgejo-experimental
-          - version: "10.0"
-            forgejo: https://codeberg.org
-            owner: forgejo
-    steps:
-      - uses: https://data.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/prepare-end-to-end
-      - name: set full-version
-        id: full-version
-        shell: bash
-        run: |
-          set -x
-          full_version=$(./end-to-end.sh full_version ${{ matrix.info.version }} ${{ matrix.info.owner }})
-          echo value="$full_version" >> $GITHUB_OUTPUT
-      - run: ./end-to-end.sh prepare_dockerd
-      - run: su forgejo -c "./end-to-end.sh test_actions ${{ matrix.info.version }}"
-      - name: update documentation
-        uses: https://data.forgejo.org/actions/cascading-pr@v2.1
-        with:
-          origin-url: ${{ env.GITHUB_SERVER_URL }}
-          origin-repo: ${{ github.repository }}
-          origin-token: ${{ secrets.CASCADE_DOCS_ORIGIN_TOKEN }}
-          origin-ref: refs/heads/main
-          destination-url: https://codeberg.org
-          destination-fork-repo: ${{ vars.CASCADE_DOCS_DESTINATION_DOER }}/docs
-          destination-repo: forgejo/docs
-          destination-branch: ${{ matrix.info.branch || format('v{0}', matrix.info.version) }}
-          destination-token: ${{ secrets.CASCADE_DOCS_DESTINATION_TOKEN }}
-          prefix: ${{ env.GITHUB_REPOSITORY }}-${{ matrix.info.version }}
-          update: .forgejo/cascading-docs
-        env:
-          FORCE_VERSION: "${{ vars.CASCADE_DOCS_FORCE_VERSION }}"
-          VERSION: "${{ steps.full-version.outputs.value }}"
-
   upgrade:
     name: upgrade and storage
     needs: [build]

upgrade/upgrade.sh

@@ -76,9 +76,8 @@ function test_gitea_upgrades() {
     # The Forgejo target migration version must be 10.0 because it is the last supported.
     # https://forgejo.org/2024-12-gitea-compatibility/
     (
-        echo gitea 1.21 forgejo 10.0
+        echo gitea 1.21 forgejo 7.0.2 forgejo 10.0.3
-        echo gitea 1.22 forgejo 10.0
+    ) | while read gitea gitea_version forgejo7 forgejo7_version forgejo forgejo_version; do
-    ) | while read gitea gitea_version forgejo forgejo_version; do
         log_info "upgrading from Gitea $gitea_version to Forgejo $forgejo_version"
         stop
         upgrade_reset $config
@@ -91,6 +90,13 @@ function test_gitea_upgrades() {
         fixture_assert
         doctor_run $config
 
+        stop
+        log_info "run Forgejo $forgejo7_version"
+        start $forgejo7_version
+        verify_storage
+        fixture_assert
+        doctor_run $config
+
         stop
         log_info "run Forgejo $forgejo_version"
         start $forgejo_version