meissa
/
forgejo
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rebase conflicts

Browse Source
forgejo-federated-star
Michael Jerger 6 months ago
parent d45706228c
commit 638462e7cc
2 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File

88
.forgejo/workflows/testing.yml
Unescape Escape View File

@ -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,13 +38,13 @@ jobs:
runs-on: docker
needs: [lint-backend, checks-backend]
container:
image: codeberg.org/forgejo/test_env:main
image: 'docker.io/node:20-bookworm'
services:
minio:
image: bitnami/minio:2021.3.17
image: 'docker.io/bitnami/minio:2023.8.31'
env:
MINIO_ACCESS_KEY: 123456
MINIO_SECRET_KEY: 12345678
MINIO_ROOT_USER: 123456
MINIO_ROOT_PASSWORD: 12345678
steps:
- uses: https://code.forgejo.org/actions/checkout@v3
- uses: https://code.forgejo.org/actions/setup-go@v4
@ -48,15 +52,16 @@ jobs:
go-version: ">=1.21"
- 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'
@ -65,10 +70,10 @@ jobs:
runs-on: docker
needs: [lint-backend, checks-backend]
container:
image: codeberg.org/forgejo/test_env:main
image: 'docker.io/node:20-bookworm'
services:
mysql:
image: mysql:8-debian
image: 'docker.io/mysql:8-debian'
env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: testgitea
@ -80,18 +85,25 @@ jobs:
- uses: https://code.forgejo.org/actions/checkout@v3
- uses: https://code.forgejo.org/actions/setup-go@v4
with:
go-version: ">=1.20.0"
- run: |
go-version: "1.21"
- 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-mysql-migration test-mysql'
su forgejo -c 'make test-mysql-migration test-mysql'
timeout-minutes: 50
env:
TAGS: bindata
@ -100,7 +112,7 @@ jobs:
runs-on: docker
needs: [lint-backend, checks-backend]
container:
image: codeberg.org/forgejo/test_env:main
image: 'docker.io/node:20-bookworm'
services:
minio:
image: bitnami/minio:2021.3.17
@ -108,7 +120,7 @@ jobs:
MINIO_ACCESS_KEY: 123456
MINIO_SECRET_KEY: 12345678
pgsql:
image: postgres:15
image: 'docker.io/postgres:15'
env:
POSTGRES_DB: test
POSTGRES_PASSWORD: postgres
@ -116,18 +128,25 @@ jobs:
- uses: https://code.forgejo.org/actions/checkout@v3
- uses: https://code.forgejo.org/actions/setup-go@v4
with:
go-version: ">=1.20.0"
- run: |
go-version: "1.21"
- 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
@ -138,23 +157,30 @@ jobs:
runs-on: docker
needs: [lint-backend, checks-backend]
container:
image: codeberg.org/forgejo/test_env:main
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.0"
- run: |
go-version: "1.21"
- 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

13
models/actions/main_test.go
Unescape Escape View File

@ -1,17 +1,18 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package actions_test
package actions
import (
"testing"
"code.gitea.io/gitea/models/unittest"
_ "code.gitea.io/gitea/models"
_ "code.gitea.io/gitea/models/actions"
_ "code.gitea.io/gitea/models/activities"
)
func TestMain(m *testing.M) {
unittest.MainTest(m)
unittest.MainTest(m, &unittest.TestOptions{
FixtureFiles: []string{
"action_runner_token.yml",
},
})
}

Write Preview
Loading…
Cancel
Save