Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-02 10:40:49 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-06 11:44:31 +0300
commit44b15190d40cfe6aeb27e8751dd646ac44db379d (patch)
tree05406e84587837db4a3c0f658c67b76cb2d9e7b3
parentba661eea55984bd4ab0c00f15c2dfa07efb07cb7 (diff)
tools: Move `module-updater` into top-level `tools/` directory
Move the `module-updater` tool into the top-level `tools/` directory so that all of our custom build tools are in one place. This also makes its sources discoverable for our formatter.
-rw-r--r--Makefile2
-rw-r--r--tools/module-updater/main.go (renamed from _support/module-updater/main.go)24
2 files changed, 13 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 4f9cf558e..de76c62f2 100644
--- a/Makefile
+++ b/Makefile
@@ -478,7 +478,7 @@ dump-database-schema: build
.PHONY: upgrade-module
upgrade-module:
- ${Q}go run ${SOURCE_DIR}/_support/module-updater/main.go -dir . -from=${FROM_MODULE} -to=${TO_MODULE}
+ ${Q}go run ${SOURCE_DIR}/tools/module-updater/main.go -dir . -from=${FROM_MODULE} -to=${TO_MODULE}
${Q}${MAKE} proto
.PHONY: git
diff --git a/_support/module-updater/main.go b/tools/module-updater/main.go
index 896d21ab7..08c5db2d0 100644
--- a/_support/module-updater/main.go
+++ b/tools/module-updater/main.go
@@ -18,18 +18,18 @@ import (
)
var skipDirs = map[string]bool{
- ".git": true,
- ".gitlab": true,
- "_build": true,
- "_support": true,
- "changelogs": true,
- "danger": true,
- "doc": true,
- "proto/go/gitalypb": true,
- "ruby": true,
- "scripts": true,
+ ".git": true,
+ ".gitlab": true,
+ "_build": true,
+ "_support": true,
+ "changelogs": true,
+ "danger": true,
+ "doc": true,
+ "proto/go/gitalypb": true,
+ "ruby": true,
+ "scripts": true,
"tools/protoc-gen-gitaly-lint/testdata": true,
- "unreleased": true,
+ "unreleased": true,
}
func main() {
@@ -119,7 +119,7 @@ func getModule(modDir string) (string, error) {
return "", fmt.Errorf("command %q: %w", strings.Join(cmd.Args, " "), err)
}
- var modInfo = struct{ Module struct{ Path string } }{}
+ modInfo := struct{ Module struct{ Path string } }{}
if err := json.Unmarshal(data, &modInfo); err != nil {
return "", err
}