diff options
| author | John Cai <jcai@gitlab.com> | 2022-05-11 17:10:30 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-05-17 18:32:05 +0300 |
| commit | d6ee09e2897b4ac43ad1e06d0d006009421b3aa3 (patch) | |
| tree | 17477020c2324a8b53d0a9fd66619fc1061c8c13 | |
| parent | aa10d39f8ab5fe1e69c8bc951db8cdd855aff4b1 (diff) | |
update module updater for v15jc-bump-gitaly-module-version-15.0
Update the documentation for the module updater to reflect v15
| -rw-r--r-- | doc/PROCESS.md | 2 | ||||
| -rw-r--r-- | tools/module-updater/main.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/PROCESS.md b/doc/PROCESS.md index ef1a571fb..d893dbf3b 100644 --- a/doc/PROCESS.md +++ b/doc/PROCESS.md @@ -471,7 +471,7 @@ If a new [major module version update](https://golang.org/doc/modules/major-vers it can be changed by running `upgrade-module` `make` task with desired parameters: ```bash -make upgrade-module FROM_MODULE=v14 TO_MODULE=v15 +make upgrade-module FROM_MODULE=v15 TO_MODULE=v16 ``` It replaces old imports with the new version in the go source files, diff --git a/tools/module-updater/main.go b/tools/module-updater/main.go index 08c5db2d0..d8cfbda1e 100644 --- a/tools/module-updater/main.go +++ b/tools/module-updater/main.go @@ -259,8 +259,8 @@ func verifyModulePath(moduleRootPath string) error { // rewriteProto re-write proto files by changing the go_package option declaration: // 1. option go_package = "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"; -// 2. option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"; -// 4. option go_package = "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"; +// 2. option go_package = "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"; +// 4. option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; func rewriteProto(moduleAbsRootPath, prev, next string) error { protoDirPath := filepath.Join(moduleAbsRootPath, "proto") if err := filepath.Walk(protoDirPath, func(path string, info fs.FileInfo, err error) error { |