Skip to content

Commit b7d5dbe

Browse files
committed
Fix linting
1 parent 923f6de commit b7d5dbe

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

.drone.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,8 @@ platform:
507507
os: linux
508508
arch: amd64
509509

510-
#depends_on:
511-
# - testing-amd64
512-
# - testing-arm64
510+
depends_on:
511+
- compliance
513512

514513
trigger:
515514
event:
@@ -554,6 +553,7 @@ steps:
554553
- apt-get install build-essential --yes
555554
- export TEST_PGSQL_SCHEMA=''
556555
- ./build/test-env-prepare.sh
556+
- make build
557557
- su gitea bash -c "export PATH=$PATH:/usr/local/go/bin && timeout -s ABRT 40m make test-e2e-pgsql"
558558
environment:
559559
GOPROXY: https://goproxy.io

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
9999

100100
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
101101

102-
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests,$(shell $(GO) list ./... | grep -v /vendor/))
102+
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
103103

104104
FOMANTIC_WORK_DIR := web_src/fomantic
105105

playwright.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const BASE_URL = process.env.GITEA_URL ? process.env.GITEA_URL.replace(/\/$/g, '
88
* @type {import('@playwright/test').PlaywrightTestConfig}
99
*/
1010
const config = {
11-
testDir: './tests/e2e/',
11+
testDir: './tests/e2e/',
1212
testMatch: /.*\.test\.e2e\.js/, // Match any .test.e2e.js files
1313

1414
/* Maximum time one test can run for. */

tests/e2e/e2e_test.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,13 @@ import (
2929
"code.gitea.io/gitea/modules/setting"
3030
"code.gitea.io/gitea/modules/storage"
3131
"code.gitea.io/gitea/modules/util"
32-
"code.gitea.io/gitea/modules/web"
3332

3433
"github.com/stretchr/testify/assert"
3534
"github.com/urfave/cli"
3635

3736
_ "net/http/pprof" // Used for debugging if enabled and a web server is running
3837
)
3938

40-
var c *web.Route
41-
4239
func TestMain(m *testing.M) {
4340
defer log.Close()
4441

@@ -207,7 +204,7 @@ func initE2eTest() {
207204
defer db.Close()
208205
}
209206

210-
//routers.GlobalInitInstalled(graceful.GetManager().HammerContext())
207+
// routers.GlobalInitInstalled(graceful.GetManager().HammerContext())
211208
}
212209

213210
func prepareTestEnv(t testing.TB, skip ...int) func() {

0 commit comments

Comments
 (0)