From b451d2869d4ee29a49a19ccbf7e9d8d54b92bd86 Mon Sep 17 00:00:00 2001 From: Mathieu Fenniak Date: Thu, 26 Mar 2026 14:59:03 +0100 Subject: [PATCH] [v11.0/forgejo] ci: update tests to run debian trixie, remove manual installation from `testing` (#11803) **Backport:** #11801 (cherry picked from commit 5365720abc0c4f718ca6bb769d8d47e7579d0bff) Forgejo CI is currently failing due to changes in debian testing packaging that are not compatible with installing `git` from testing onto a bookworm system (https://codeberg.org/forgejo/forgejo/actions/runs/147815/jobs/2/attempt/1#jobstep-3-144). Where `git` was being installed from testing it is replaced with just using trixie's `git 2.47.3`. Where `git-lfs` was being installed, it's been inlined with a simple `update` and `install`. ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11801 Reviewed-by: Andreas Ahlenstorf Co-authored-by: Mathieu Fenniak Co-committed-by: Mathieu Fenniak Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11803 Reviewed-by: Andreas Ahlenstorf --- .forgejo/workflows/testing.yml | 48 ++++++++++++++-------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index 99c81f63b0..a14ebab409 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -13,7 +13,7 @@ jobs: if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' runs-on: docker container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime steps: - name: event info @@ -30,7 +30,7 @@ jobs: if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' runs-on: docker container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime steps: - uses: https://data.forgejo.org/actions/checkout@v4 @@ -55,7 +55,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime services: elasticsearch: @@ -75,10 +75,6 @@ jobs: steps: - uses: https://data.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/workflows-composite/setup-env - - name: install git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from - with: - packages: git - name: test release-notes-assistant.sh run: | apt-get -q install -qq -y jq @@ -139,7 +135,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks, test-unit] container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime name: ${{ format('test-remote-cacher ({0})', matrix.cacher.name) }} strategy: @@ -164,10 +160,6 @@ jobs: steps: - uses: https://data.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/workflows-composite/setup-env - - name: install git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from - with: - packages: git - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-remote-cacher test-check' @@ -181,7 +173,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime services: mysql: @@ -197,10 +189,10 @@ jobs: steps: - uses: https://data.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/workflows-composite/setup-env - - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from - with: - packages: git git-lfs + - name: install dependencies + run: apt-get update -qq && apt-get -q install -qq -y git-lfs + env: + DEBIAN_FRONTEND: noninteractive - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-mysql-migration test-mysql' @@ -212,7 +204,7 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime services: minio: @@ -235,10 +227,10 @@ jobs: steps: - uses: https://data.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/workflows-composite/setup-env - - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from - with: - packages: git git-lfs + - name: install dependencies + run: apt-get update -qq && apt-get -q install -qq -y git-lfs + env: + DEBIAN_FRONTEND: noninteractive - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-pgsql-migration test-pgsql' @@ -252,15 +244,15 @@ jobs: runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime steps: - uses: https://data.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/workflows-composite/setup-env - - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from - with: - packages: git git-lfs + - name: install dependencies + run: apt-get update -qq && apt-get -q install -qq -y git-lfs + env: + DEBIAN_FRONTEND: noninteractive - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-sqlite-migration test-sqlite' @@ -280,7 +272,7 @@ jobs: - test-remote-cacher - test-unit container: - image: 'data.forgejo.org/oci/node:22-bookworm' + image: 'data.forgejo.org/oci/node:22-trixie' options: --tmpfs /tmp:exec,noatime steps: - uses: https://data.forgejo.org/actions/checkout@v4