修改makefile
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				DevStar Studio CI Pipeline - master branch / build-and-push-x86-64-docker-image (push) Failing after 1m29s
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	DevStar Studio CI Pipeline - master branch / build-and-push-x86-64-docker-image (push) Failing after 1m29s
				
			This commit is contained in:
		
							
								
								
									
										104
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										104
									
								
								Makefile
									
									
									
									
									
								
							@@ -101,59 +101,6 @@ else
 | 
				
			|||||||
		GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
 | 
							GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
 | 
				
			||||||
	endif
 | 
						endif
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					 | 
				
			||||||
# if version = "main" then update version to "nightly"
 | 
					 | 
				
			||||||
ifeq ($(VERSION),main)
 | 
					 | 
				
			||||||
	VERSION := main-nightly
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list 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/))
 | 
					 | 
				
			||||||
MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
FOMANTIC_WORK_DIR := web_src/fomantic
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
 | 
					 | 
				
			||||||
WEBPACK_CONFIGS := webpack.config.js tailwind.config.js
 | 
					 | 
				
			||||||
WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
 | 
					 | 
				
			||||||
WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
 | 
					 | 
				
			||||||
BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
GENERATED_GO_DEST := modules/charset/invisible_gen.go modules/charset/ambiguous_gen.go
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
SVG_DEST_DIR := public/assets/img/svg
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
AIR_TMP_DIR := .air
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
GO_LICENSE_TMP_DIR := .go-licenses
 | 
					 | 
				
			||||||
GO_LICENSE_FILE := assets/go-licenses.json
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
TAGS ?=
 | 
					 | 
				
			||||||
TAGS_SPLIT := $(subst $(COMMA), ,$(TAGS))
 | 
					 | 
				
			||||||
TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
TEST_TAGS ?= sqlite sqlite_unlock_notify
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
GO_DIRS := build cmd models modules routers services tests
 | 
					 | 
				
			||||||
WEB_DIRS := web_src/js web_src/css
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ESLINT_FILES := web_src/js tools *.js tests/e2e
 | 
					 | 
				
			||||||
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
 | 
					 | 
				
			||||||
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
 | 
					 | 
				
			||||||
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
GO_SOURCES := $(wildcard *.go)
 | 
					 | 
				
			||||||
GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" ! -path modules/options/bindata.go ! -path modules/public/bindata.go ! -path modules/templates/bindata.go)
 | 
					 | 
				
			||||||
GO_SOURCES += $(GENERATED_GO_DEST)
 | 
					 | 
				
			||||||
GO_SOURCES_NO_BINDATA := $(GO_SOURCES)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
 | 
					ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
 | 
				
			||||||
	GO_SOURCES += $(BINDATA_DEST)
 | 
						GO_SOURCES += $(BINDATA_DEST)
 | 
				
			||||||
	GENERATED_GO_DEST += $(BINDATA_DEST)
 | 
						GENERATED_GO_DEST += $(BINDATA_DEST)
 | 
				
			||||||
@@ -284,30 +231,7 @@ node-check:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
.PHONY: clean-all
 | 
					.PHONY: clean-all
 | 
				
			||||||
clean-all: clean
 | 
					clean-all: clean
 | 
				
			||||||
	rm -rf $(WEBPACK_DEST_ENTRIES) node_modules
 | 
						rm -rf $(WEBPACK_DEST_ENTRIES) node_moduless
 | 
				
			||||||
 | 
					 | 
				
			||||||
.PHONY: clean
 | 
					 | 
				
			||||||
clean:
 | 
					 | 
				
			||||||
	rm -rf $(EXECUTABLE) $(DIST) $(BINDATA_DEST) $(BINDATA_HASH) \
 | 
					 | 
				
			||||||
		integrations*.test \
 | 
					 | 
				
			||||||
		e2e*.test \
 | 
					 | 
				
			||||||
		tests/integration/gitea-integration-* \
 | 
					 | 
				
			||||||
		tests/integration/indexers-* \
 | 
					 | 
				
			||||||
		tests/mysql.ini tests/pgsql.ini tests/mssql.ini man/ \
 | 
					 | 
				
			||||||
		tests/e2e/gitea-e2e-*/ \
 | 
					 | 
				
			||||||
		tests/e2e/indexers-*/ \
 | 
					 | 
				
			||||||
		tests/e2e/reports/ tests/e2e/test-artifacts/ tests/e2e/test-snapshots/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.PHONY: fmt
 | 
					 | 
				
			||||||
fmt:
 | 
					 | 
				
			||||||
	@GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
 | 
					 | 
				
			||||||
	$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
 | 
					 | 
				
			||||||
	@# strip whitespace after '{{' or '(' and before '}}' or ')' unless there is only
 | 
					 | 
				
			||||||
	@# whitespace before it
 | 
					 | 
				
			||||||
	@$(SED_INPLACE) \
 | 
					 | 
				
			||||||
		-e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' \
 | 
					 | 
				
			||||||
	  -e 's/([ 	]\{1,\}/(/g' -e '/^[ 	]\{1,\})/! s/[ 	]\{1,\})/)/g' \
 | 
					 | 
				
			||||||
	  $(TEMPLATES)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: fmt-check
 | 
					.PHONY: fmt-check
 | 
				
			||||||
fmt-check: fmt
 | 
					fmt-check: fmt
 | 
				
			||||||
@@ -494,11 +418,6 @@ test\#%:
 | 
				
			|||||||
	@echo "Running go test with -tags '$(TEST_TAGS)'..."
 | 
						@echo "Running go test with -tags '$(TEST_TAGS)'..."
 | 
				
			||||||
	@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES)
 | 
						@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: coverage
 | 
					 | 
				
			||||||
coverage:
 | 
					 | 
				
			||||||
	grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' coverage.out > coverage-bodged.out
 | 
					 | 
				
			||||||
	grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' integration.coverage.out > integration.coverage-bodged.out
 | 
					 | 
				
			||||||
	$(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: unit-test-coverage
 | 
					.PHONY: unit-test-coverage
 | 
				
			||||||
unit-test-coverage:
 | 
					unit-test-coverage:
 | 
				
			||||||
@@ -524,20 +443,6 @@ tidy-check: tidy
 | 
				
			|||||||
		exit 1; \
 | 
							exit 1; \
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: go-licenses
 | 
					 | 
				
			||||||
go-licenses: $(GO_LICENSE_FILE)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
$(GO_LICENSE_FILE): go.mod go.sum
 | 
					 | 
				
			||||||
	-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
 | 
					 | 
				
			||||||
	$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
 | 
					 | 
				
			||||||
	@rm -rf $(GO_LICENSE_TMP_DIR)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
generate-ini-sqlite:
 | 
					 | 
				
			||||||
	sed -e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
 | 
					 | 
				
			||||||
		-e 's|{{TEST_LOGGER}}|$(or $(TEST_LOGGER),test$(COMMA)file)|g' \
 | 
					 | 
				
			||||||
		-e 's|{{TEST_TYPE}}|$(or $(TEST_TYPE),integration)|g' \
 | 
					 | 
				
			||||||
			tests/sqlite.ini.tmpl > tests/sqlite.ini
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.PHONY: test-sqlite
 | 
					.PHONY: test-sqlite
 | 
				
			||||||
test-sqlite: integrations.sqlite.test generate-ini-sqlite
 | 
					test-sqlite: integrations.sqlite.test generate-ini-sqlite
 | 
				
			||||||
	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test
 | 
						GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test
 | 
				
			||||||
@@ -972,13 +877,6 @@ update-translations:
 | 
				
			|||||||
	mv ./translations/*.ini ./options/locale/
 | 
						mv ./translations/*.ini ./options/locale/
 | 
				
			||||||
	rmdir ./translations
 | 
						rmdir ./translations
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: generate-license
 | 
					 | 
				
			||||||
generate-license:
 | 
					 | 
				
			||||||
	$(GO) run build/generate-licenses.go
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.PHONY: generate-gitignore
 | 
					 | 
				
			||||||
generate-gitignore:
 | 
					 | 
				
			||||||
	$(GO) run build/generate-gitignores.go
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: generate-images
 | 
					.PHONY: generate-images
 | 
				
			||||||
generate-images: | node_modules
 | 
					generate-images: | node_modules
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user