1-
21ifeq ($(USE_REPO_TEST_DIR ) ,1)
32
43# This rule replaces the whole Makefile when we're trying to use /tmp repository temporary files
@@ -110,7 +109,10 @@ TAGS ?=
110109TAGS_SPLIT := $(subst $(COMMA ) , ,$(TAGS ) )
111110TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR ) /tags
112111
112+ TEST_TAGS ?= sqlite sqlite_unlock_notify
113+
113114GO_DIRS := cmd integrations models modules routers build services vendor tools
115+
114116GO_SOURCES := $(wildcard * .go)
115117GO_SOURCES += $(shell find $(GO_DIRS ) -type f -name "* .go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
116118
@@ -339,8 +341,8 @@ watch-backend: go-check
339341
340342.PHONY : test
341343test :
342- @echo " Running go test..."
343- @$(GO ) test $(GOTESTFLAGS ) -mod=vendor -tags=' sqlite sqlite_unlock_notify ' $(GO_PACKAGES )
344+ @echo " Running go test with -tags ' $( TEST_TAGS ) ' ..."
345+ @$(GO ) test $(GOTESTFLAGS ) -mod=vendor -tags=' $(TEST_TAGS) ' $(GO_PACKAGES )
344346
345347.PHONY : test-check
346348test-check :
@@ -356,17 +358,17 @@ test-check:
356358
357359.PHONY : test\# %
358360test\#% :
359- @echo " Running go test..."
360- @$(GO ) test -mod=vendor -tags=' sqlite sqlite_unlock_notify ' $(subst .,/,$* ) $(GO_PACKAGES )
361+ @echo " Running go test with -tags ' $( TEST_TAGS ) ' ..."
362+ @$(GO ) test -mod=vendor -tags=' $(TEST_TAGS) ' $(subst .,/,$* ) $(GO_PACKAGES )
361363
362364.PHONY : coverage
363365coverage :
364366 GO111MODULE=on $(GO ) run -mod=vendor build/gocovmerge.go integration.coverage.out $(shell find . -type f -name "coverage.out") > coverage.all
365367
366368.PHONY : unit-test-coverage
367369unit-test-coverage :
368- @echo " Running unit-test-coverage..."
369- @$(GO ) test $(GOTESTFLAGS ) -mod=vendor -tags=' sqlite sqlite_unlock_notify ' $(GO_PACKAGES ) && echo " \n==>\033[32m Ok\033[m\n" || exit 1
370+ @echo " Running unit-test-coverage -tags ' $( TEST_TAGS ) ' ..."
371+ @$(GO ) test $(GOTESTFLAGS ) -mod=vendor -tags=' $(TEST_TAGS) ' $(GO_PACKAGES ) && echo " \n==>\033[32m Ok\033[m\n" || exit 1
370372
371373.PHONY : vendor
372374vendor :
@@ -387,15 +389,15 @@ generate-ini-sqlite:
387389
388390.PHONY : test-sqlite
389391test-sqlite : integrations.sqlite.test generate-ini-sqlite
390- GITEA_ROOT=${ CURDIR}
392+ GITEA_ROOT=" $( CURDIR) "
391393
392394.PHONY : test-sqlite\# %
393395test-sqlite\#% : integrations.sqlite.test generate-ini-sqlite
394- GITEA_ROOT=${ CURDIR} $(subst .,/,$* )
396+ GITEA_ROOT=" $( CURDIR) " $(subst .,/,$* )
395397
396398.PHONY : test-sqlite-migration
397399test-sqlite-migration : migrations.sqlite.test generate-ini-sqlite
398- GITEA_ROOT=${ CURDIR}
400+ GITEA_ROOT=" $( CURDIR) "
399401
400402generate-ini-mysql :
401403 sed -e ' s|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
@@ -407,15 +409,15 @@ generate-ini-mysql:
407409
408410.PHONY : test-mysql
409411test-mysql : integrations.mysql.test generate-ini-mysql
410- GITEA_ROOT=${ CURDIR}
412+ GITEA_ROOT=" $( CURDIR) "
411413
412414.PHONY : test-mysql\# %
413415test-mysql\#% : integrations.mysql.test generate-ini-mysql
414- GITEA_ROOT=${ CURDIR} $(subst .,/,$* )
416+ GITEA_ROOT=" $( CURDIR) " $(subst .,/,$* )
415417
416418.PHONY : test-mysql-migration
417419test-mysql-migration : migrations.mysql.test generate-ini-mysql
418- GITEA_ROOT=${ CURDIR}
420+ GITEA_ROOT=" $( CURDIR) "
419421
420422generate-ini-mysql8 :
421423 sed -e ' s|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
@@ -427,15 +429,15 @@ generate-ini-mysql8:
427429
428430.PHONY : test-mysql8
429431test-mysql8 : integrations.mysql8.test generate-ini-mysql8
430- GITEA_ROOT=${ CURDIR}
432+ GITEA_ROOT=" $( CURDIR) "
431433
432434.PHONY : test-mysql8\# %
433435test-mysql8\#% : integrations.mysql8.test generate-ini-mysql8
434- GITEA_ROOT=${ CURDIR} $(subst .,/,$* )
436+ GITEA_ROOT=" $( CURDIR) " $(subst .,/,$* )
435437
436438.PHONY : test-mysql8-migration
437439test-mysql8-migration : migrations.mysql8.test generate-ini-mysql8
438- GITEA_ROOT=${ CURDIR}
440+ GITEA_ROOT=" $( CURDIR) "
439441
440442generate-ini-pgsql :
441443 sed -e ' s|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
@@ -448,15 +450,15 @@ generate-ini-pgsql:
448450
449451.PHONY : test-pgsql
450452test-pgsql : integrations.pgsql.test generate-ini-pgsql
451- GITEA_ROOT=${ CURDIR}
453+ GITEA_ROOT=" $( CURDIR) "
452454
453455.PHONY : test-pgsql\# %
454456test-pgsql\#% : integrations.pgsql.test generate-ini-pgsql
455- GITEA_ROOT=${ CURDIR} $(subst .,/,$* )
457+ GITEA_ROOT=" $( CURDIR) " $(subst .,/,$* )
456458
457459.PHONY : test-pgsql-migration
458460test-pgsql-migration : migrations.pgsql.test generate-ini-pgsql
459- GITEA_ROOT=${ CURDIR}
461+ GITEA_ROOT=" $( CURDIR) "
460462
461463generate-ini-mssql :
462464 sed -e ' s|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
@@ -468,35 +470,35 @@ generate-ini-mssql:
468470
469471.PHONY : test-mssql
470472test-mssql : integrations.mssql.test generate-ini-mssql
471- GITEA_ROOT=${ CURDIR}
473+ GITEA_ROOT=" $( CURDIR) "
472474
473475.PHONY : test-mssql\# %
474476test-mssql\#% : integrations.mssql.test generate-ini-mssql
475- GITEA_ROOT=${ CURDIR} $(subst .,/,$* )
477+ GITEA_ROOT=" $( CURDIR) " $(subst .,/,$* )
476478
477479.PHONY : test-mssql-migration
478480test-mssql-migration : migrations.mssql.test generate-ini-mssql
479- GITEA_ROOT=${ CURDIR}
481+ GITEA_ROOT=" $( CURDIR) "
480482
481483.PHONY : bench-sqlite
482484bench-sqlite : integrations.sqlite.test generate-ini-sqlite
483- GITEA_ROOT=${ CURDIR} .
485+ GITEA_ROOT=" $( CURDIR) " .
484486
485487.PHONY : bench-mysql
486488bench-mysql : integrations.mysql.test generate-ini-mysql
487- GITEA_ROOT=${ CURDIR} .
489+ GITEA_ROOT=" $( CURDIR) " .
488490
489491.PHONY : bench-mssql
490492bench-mssql : integrations.mssql.test generate-ini-mssql
491- GITEA_ROOT=${ CURDIR} .
493+ GITEA_ROOT=" $( CURDIR) " .
492494
493495.PHONY : bench-pgsql
494496bench-pgsql : integrations.pgsql.test generate-ini-pgsql
495- GITEA_ROOT=${ CURDIR} .
497+ GITEA_ROOT=" $( CURDIR) " .
496498
497499.PHONY : integration-test-coverage
498500integration-test-coverage : integrations.cover.test generate-ini-mysql
499- GITEA_ROOT=${ CURDIR}
501+ GITEA_ROOT=" $( CURDIR) "
500502
501503integrations.mysql.test : git-check $(GO_SOURCES )
502504 $(GO ) test $(GOTESTFLAGS ) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
@@ -511,7 +513,7 @@ integrations.mssql.test: git-check $(GO_SOURCES)
511513 $(GO ) test $(GOTESTFLAGS ) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mssql.test
512514
513515integrations.sqlite.test : git-check $(GO_SOURCES )
514- $(GO ) test $(GOTESTFLAGS ) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags ' sqlite sqlite_unlock_notify '
516+ $(GO ) test $(GOTESTFLAGS ) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags ' $(TEST_TAGS) '
515517
516518integrations.cover.test : git-check $(GO_SOURCES )
517519 $(GO ) test $(GOTESTFLAGS ) -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(GO_PACKAGES ) | tr ' ' ',') -o integrations.cover.test
@@ -534,7 +536,7 @@ migrations.mssql.test: $(GO_SOURCES)
534536
535537.PHONY : migrations.sqlite.test
536538migrations.sqlite.test : $(GO_SOURCES )
537- $(GO ) test $(GOTESTFLAGS ) -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags ' sqlite sqlite_unlock_notify '
539+ $(GO ) test $(GOTESTFLAGS ) -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags ' $(TEST_TAGS) '
538540
539541.PHONY : check
540542check : test
@@ -694,11 +696,10 @@ generate-license:
694696generate-gitignore :
695697 GO111MODULE=on $(GO ) run build/generate-gitignores.go
696698
697-
698699.PHONY : generate-images
699700generate-images :
700- npm install --no-save --no-package-lock xmldom fabric imagemin-zopfli
701- node build/generate-images.js
701+ npm install --no-save --no-package-lock fabric imagemin-zopfli
702+ node build/generate-images.js $( TAGS )
702703
703704.PHONY : pr\# %
704705pr\#% : clean-all
@@ -710,7 +711,7 @@ golangci-lint:
710711 export BINARY=" golangci-lint" ; \
711712 curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH ) /bin v1.31.0; \
712713 fi
713- golangci-lint run --timeout 5m
714+ golangci-lint run --timeout 10m
714715
715716.PHONY : docker
716717docker :
@@ -719,7 +720,7 @@ docker:
719720
720721.PHONY : docker-build
721722docker-build :
722- docker run -ti --rm -v $(CURDIR ) :/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS=" bindata $( TAGS) " " $( LDFLAGS) " " $( CGO_EXTRA_CFLAGS) "
723+ docker run -ti --rm -v " $( CURDIR) " " bindata $( TAGS) " " $( LDFLAGS) " " $( CGO_EXTRA_CFLAGS) "
723724
724725# This endif closes the if at the top of the file
725726endif
0 commit comments