Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
wxiaoguang committed Mar 25, 2023
1 parent e37ef4d commit 532a011
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 303 deletions.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ 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 := cmd tests models modules routers build services tools
GO_DIRS := build cmd models modules routers services tests
WEB_DIRS := web_src/js web_src/css

GO_SOURCES := $(wildcard *.go)
Expand Down Expand Up @@ -219,7 +219,6 @@ help:
@echo " - tidy run go mod tidy"
@echo " - test[\#TestSpecificName] run unit test"
@echo " - test-sqlite[\#TestSpecificName] run integration test for sqlite"
@echo " - pr#<index> build and start gitea from a PR with integration test data loaded"

.PHONY: go-check
go-check:
Expand Down Expand Up @@ -353,7 +352,7 @@ lint-backend: golangci-lint vet editorconfig-checker

.PHONY: watch
watch:
bash tools/watch.sh
bash build/watch.sh

.PHONY: watch-frontend
watch-frontend: node-check node_modules
Expand Down Expand Up @@ -939,10 +938,6 @@ generate-manpage:
@gzip -9 man/man1/gitea.1 && echo man/man1/gitea.1.gz created
@#TODO A small script that formats config-cheat-sheet.en-us.md nicely for use as a config man page

.PHONY: pr\#%
pr\#%: clean-all
$(GO) run contrib/pr/checkout.go $*

.PHONY: golangci-lint
golangci-lint:
$(GO) run $(GOLANGCI_LINT_PACKAGE) run
Expand Down
3 changes: 3 additions & 0 deletions build/backport-locales.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

//go:build ignore

package main
Expand Down
1 change: 0 additions & 1 deletion build/code-batch-process.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ func newFileCollector(fileFilter string, batchSize int) (*fileCollector, error)
"modules",
"routers",
"services",
"tools",
}
co.includePatterns = append(co.includePatterns, regexp.MustCompile(`.*\.go$`))

Expand Down
20 changes: 20 additions & 0 deletions build/test-echo.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

//go:build ignore

package main

import (
"fmt"
"io"
"os"
)

func main() {
_, err := io.Copy(os.Stdout, os.Stdin)
if err != nil {
fmt.Fprintf(os.Stderr, "Error: %v", err)
os.Exit(1)
}
}
File renamed without changes.
2 changes: 0 additions & 2 deletions contrib/autoboot.sh

This file was deleted.

2 changes: 0 additions & 2 deletions contrib/mysql.sql

This file was deleted.

267 changes: 0 additions & 267 deletions contrib/pr/checkout.go

This file was deleted.

2 changes: 1 addition & 1 deletion tests/sqlite.ini.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@ ENABLED = true
[markup.html]
ENABLED = true
FILE_EXTENSIONS = .html
RENDER_COMMAND = `go run tools/external_renderer.go`
RENDER_COMMAND = `go run build/test-echo.go`
IS_INPUT_FILE = false
RENDER_CONTENT_MODE=sanitized
23 changes: 0 additions & 23 deletions tools/external_renderer.go

This file was deleted.

0 comments on commit 532a011

Please sign in to comment.