From ee48c0d5ea8f148c7f4a792b590d93eb51cbf67d Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 20 Oct 2023 16:00:40 +0200 Subject: [PATCH] [CI] Forgejo Actions based CI for PR & branches (squash) use node:20-bookworm No longer use the custom test-env image, it is unecessary technical debt. Also upgrade to bitnami/minio:2023.8.31 to align with what Gitea tests (cherry picked from commit d9b77fd2735a52043b4f8f1baaaa2e15073db621) Conflicts: .forgejo/workflows/testing.yml * mysql was mysql-8 in v1.21 and below * No MINIO testing * go 1.20 instead of go 1.21 --- .forgejo/workflows/testing.yml | 74 +++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index 1e53cf689..790d7abd4 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -10,6 +10,8 @@ on: jobs: lint-backend: runs-on: docker + container: + image: 'docker.io/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 @@ -22,6 +24,8 @@ jobs: TAGS: bindata sqlite sqlite_unlock_notify checks-backend: runs-on: docker + container: + image: 'docker.io/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 @@ -34,7 +38,7 @@ jobs: runs-on: docker needs: [lint-backend, checks-backend] container: - image: codeberg.org/forgejo/test_env:1.20 + image: 'docker.io/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 @@ -42,15 +46,16 @@ jobs: go-version: "1.20" - run: | git config --add safe.directory '*' - chown -R gitea:gitea . /go + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . - run: | - su gitea -c 'make deps-backend' + su forgejo -c 'make deps-backend' - run: | - su gitea -c 'make backend' + su forgejo -c 'make backend' env: TAGS: bindata - run: | - su gitea -c 'make unit-test-coverage test-check' + su forgejo -c 'make unit-test-coverage test-check' timeout-minutes: 50 env: RACE_ENABLED: 'true' @@ -59,7 +64,7 @@ jobs: runs-on: docker needs: [lint-backend, checks-backend] container: - image: codeberg.org/forgejo/test_env:1.20 + image: 'docker.io/node:20-bookworm' services: mysql8: image: mysql:8-debian @@ -77,17 +82,24 @@ jobs: - uses: https://code.forgejo.org/actions/setup-go@v4 with: go-version: "1.20" - - run: | + - name: install dependencies + run: | + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq + apt-get install --no-install-recommends -qq -y git-lfs + - name: setup user and permissions + run: | git config --add safe.directory '*' - chown -R gitea:gitea . /go + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . - run: | - su gitea -c 'make deps-backend' + su forgejo -c 'make deps-backend' - run: | - su gitea -c 'make backend' + su forgejo -c 'make backend' env: TAGS: bindata - run: | - su gitea -c 'make test-mysql8-migration test-mysql8' + su forgejo -c 'make test-mysql8-migration test-mysql8' timeout-minutes: 50 env: TAGS: bindata @@ -96,10 +108,10 @@ jobs: runs-on: docker needs: [lint-backend, checks-backend] container: - image: codeberg.org/forgejo/test_env:1.20 + image: 'docker.io/node:20-bookworm' services: pgsql: - image: postgres:15 + image: 'docker.io/postgres:15' env: POSTGRES_DB: test POSTGRES_PASSWORD: postgres @@ -110,17 +122,24 @@ jobs: - uses: https://code.forgejo.org/actions/setup-go@v4 with: go-version: "1.20" - - run: | + - name: install dependencies + run: | + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq + apt-get install --no-install-recommends -qq -y git-lfs + - name: setup user and permissions + run: | git config --add safe.directory '*' - chown -R gitea:gitea . /go + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . - run: | - su gitea -c 'make deps-backend' + su forgejo -c 'make deps-backend' - run: | - su gitea -c 'make backend' + su forgejo -c 'make backend' env: TAGS: bindata - run: | - su gitea -c 'make test-pgsql-migration test-pgsql' + su forgejo -c 'make test-pgsql-migration test-pgsql' timeout-minutes: 50 env: TAGS: bindata gogit @@ -131,23 +150,30 @@ jobs: runs-on: docker needs: [lint-backend, checks-backend] container: - image: codeberg.org/forgejo/test_env:1.20 + image: 'docker.io/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: go-version: "1.20" - - run: | + - name: install dependencies + run: | + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq + apt-get install --no-install-recommends -qq -y git-lfs + - name: setup user and permissions + run: | git config --add safe.directory '*' - chown -R gitea:gitea . /go + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . - run: | - su gitea -c 'make deps-backend' + su forgejo -c 'make deps-backend' - run: | - su gitea -c 'make backend' + su forgejo -c 'make backend' env: TAGS: bindata gogit sqlite sqlite_unlock_notify - run: | - su gitea -c 'make test-sqlite-migration test-sqlite' + su forgejo -c 'make test-sqlite-migration test-sqlite' timeout-minutes: 50 env: TAGS: bindata gogit sqlite sqlite_unlock_notify