diff options
| author | Daniel Smith <daniel.smith@qt.io> | 2021-01-27 12:13:55 +0100 |
|---|---|---|
| committer | Daniel Smith <daniel.smith@qt.io> | 2021-02-15 15:45:07 +0100 |
| commit | c41f11438bb1990d8d4c79866afa0694fa6bed72 (patch) | |
| tree | faa8850f1890b2b1a186980df22c03ed23017ee3 /src | |
| parent | 8e4cd93c5f62f7826d0aacfaa1302db45227e32f (diff) | |
| download | qtqa-c41f11438bb1990d8d4c79866afa0694fa6bed72.tar.gz | |
Update Qt Submoduleupdater to ignore status=additionalLibrary
The qt5 submodule update bot should ignore additionalLibrary modules
in .gitmodules. These are to be updated via other tools or manually
as needed.
Task-number: QTBUG-90668
Change-Id: I7b79cd4b7025314d91d939105dc0989aaa69843a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qtmoduleupdater/moduleupdatebatch.go | 6 | ||||
| -rw-r--r-- | src/qtmoduleupdater/qt5.go | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/qtmoduleupdater/moduleupdatebatch.go b/src/qtmoduleupdater/moduleupdatebatch.go index c78629d..3c2d1cc 100644 --- a/src/qtmoduleupdater/moduleupdatebatch.go +++ b/src/qtmoduleupdater/moduleupdatebatch.go @@ -313,11 +313,7 @@ func (batch *ModuleUpdateBatch) clearStateCommit(gerrit *gerritInstance) error { return fmt.Errorf("Error determining %s repo URL: %s", batch.Product, err) } - if gerrit.pushUserName != "" { - pushURL.User = url.User(gerrit.pushUserName) - } - - targetRef := "refs/personal/" + pushURL.User.Username() + "/state/" + batch.Branch + targetRef := "refs/personal/qt_submodule_update_bot/state/" + batch.Branch log.Printf("Clearing batch state at %s\n", targetRef) diff --git a/src/qtmoduleupdater/qt5.go b/src/qtmoduleupdater/qt5.go index 3cecb42..5d7fba2 100644 --- a/src/qtmoduleupdater/qt5.go +++ b/src/qtmoduleupdater/qt5.go @@ -88,6 +88,8 @@ func listSubmodules(repo Repository, repoURL *url.URL, commit OID) (modules map[ if status, ok := values["status"]; ok { if status == "ignore" { continue + } else if status == "additionalLibrary" { + continue } } else if initRepo, ok := values["initrepo"]; ok { if initRepo != "true" { |