ci: update tests to run debian trixie, remove manual installation from testing (#11801)

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 <aahlenst@noreply.codeberg.org>
Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net>
Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
This commit is contained in:
Mathieu Fenniak 2026-03-24 21:57:38 +01:00 committed by Mathieu Fenniak
parent 0a8540f52f
commit 5365720abc
2 changed files with 27 additions and 35 deletions

View file

@ -31,7 +31,7 @@ jobs:
if: vars.ROLE == 'forgejo-integration' if: vars.ROLE == 'forgejo-integration'
runs-on: docker runs-on: docker
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
@ -50,7 +50,7 @@ jobs:
if: vars.ROLE == 'forgejo-integration' if: vars.ROLE == 'forgejo-integration'
runs-on: docker runs-on: docker
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
@ -75,7 +75,7 @@ jobs:
matrix: matrix:
version: ['10.6', '11.8'] version: ['10.6', '11.8']
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
services: services:
mysql: mysql:
@ -87,10 +87,10 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
- uses: ./.forgejo/workflows-composite/setup-env - uses: ./.forgejo/workflows-composite/setup-env
- name: install dependencies & git >= 2.42 - name: install dependencies
uses: ./.forgejo/workflows-composite/apt-install-from run: apt-get update -qq && apt-get -q install -qq -y git-lfs
with: env:
packages: git git-lfs DEBIAN_FRONTEND: noninteractive
- uses: ./.forgejo/workflows-composite/build-backend - uses: ./.forgejo/workflows-composite/build-backend
- run: | - run: |
su forgejo -c 'make test-mysql-migration test-mysql' su forgejo -c 'make test-mysql-migration test-mysql'

View file

@ -14,7 +14,7 @@ jobs:
if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing'
runs-on: docker runs-on: docker
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
steps: steps:
- name: event info - name: event info
@ -33,7 +33,7 @@ jobs:
if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing'
runs-on: docker runs-on: docker
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
@ -68,7 +68,7 @@ jobs:
runs-on: docker runs-on: docker
needs: [backend-checks, frontend-checks] needs: [backend-checks, frontend-checks]
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
services: services:
elasticsearch: elasticsearch:
@ -88,10 +88,6 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
- uses: ./.forgejo/workflows-composite/setup-env - 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 - name: test release-notes-assistant.sh
run: | run: |
apt-get -q install -qq -y jq apt-get -q install -qq -y jq
@ -158,7 +154,7 @@ jobs:
runs-on: docker runs-on: docker
needs: [backend-checks, frontend-checks, test-unit] needs: [backend-checks, frontend-checks, test-unit]
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
name: ${{ format('test-remote-cacher ({0})', matrix.cacher.name) }} name: ${{ format('test-remote-cacher ({0})', matrix.cacher.name) }}
strategy: strategy:
@ -185,10 +181,6 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
- uses: ./.forgejo/workflows-composite/setup-env - 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 - uses: ./.forgejo/workflows-composite/build-backend
- run: | - run: |
su forgejo -c 'make test-remote-cacher test-check' su forgejo -c 'make test-remote-cacher test-check'
@ -202,7 +194,7 @@ jobs:
runs-on: docker runs-on: docker
needs: [backend-checks, frontend-checks] needs: [backend-checks, frontend-checks]
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
services: services:
mysql: mysql:
@ -218,10 +210,10 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
- uses: ./.forgejo/workflows-composite/setup-env - uses: ./.forgejo/workflows-composite/setup-env
- name: install dependencies & git >= 2.42 - name: install dependencies
uses: ./.forgejo/workflows-composite/apt-install-from run: apt-get update -qq && apt-get -q install -qq -y git-lfs
with: env:
packages: git git-lfs DEBIAN_FRONTEND: noninteractive
- uses: ./.forgejo/workflows-composite/build-backend - uses: ./.forgejo/workflows-composite/build-backend
- run: | - run: |
su forgejo -c 'make test-mysql-migration test-mysql' su forgejo -c 'make test-mysql-migration test-mysql'
@ -233,7 +225,7 @@ jobs:
runs-on: docker runs-on: docker
needs: [backend-checks, frontend-checks] needs: [backend-checks, frontend-checks]
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
services: services:
minio: minio:
@ -256,10 +248,10 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
- uses: ./.forgejo/workflows-composite/setup-env - uses: ./.forgejo/workflows-composite/setup-env
- name: install dependencies & git >= 2.42 - name: install dependencies
uses: ./.forgejo/workflows-composite/apt-install-from run: apt-get update -qq && apt-get -q install -qq -y git-lfs
with: env:
packages: git git-lfs DEBIAN_FRONTEND: noninteractive
- uses: ./.forgejo/workflows-composite/build-backend - uses: ./.forgejo/workflows-composite/build-backend
- run: | - run: |
su forgejo -c 'make test-pgsql-migration test-pgsql' su forgejo -c 'make test-pgsql-migration test-pgsql'
@ -273,15 +265,15 @@ jobs:
runs-on: docker runs-on: docker
needs: [backend-checks, frontend-checks] needs: [backend-checks, frontend-checks]
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6
- uses: ./.forgejo/workflows-composite/setup-env - uses: ./.forgejo/workflows-composite/setup-env
- name: install dependencies & git >= 2.42 - name: install dependencies
uses: ./.forgejo/workflows-composite/apt-install-from run: apt-get update -qq && apt-get -q install -qq -y git-lfs
with: env:
packages: git git-lfs DEBIAN_FRONTEND: noninteractive
- uses: ./.forgejo/workflows-composite/build-backend - uses: ./.forgejo/workflows-composite/build-backend
- run: | - run: |
su forgejo -c 'make test-sqlite-migration test-sqlite' su forgejo -c 'make test-sqlite-migration test-sqlite'
@ -301,7 +293,7 @@ jobs:
- test-remote-cacher - test-remote-cacher
- test-unit - test-unit
container: container:
image: 'data.forgejo.org/oci/node:24-bookworm' image: 'data.forgejo.org/oci/node:24-trixie'
options: --tmpfs /tmp:exec,noatime options: --tmpfs /tmp:exec,noatime
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v6 - uses: https://data.forgejo.org/actions/checkout@v6