deploy.git
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Lucas_Werkmeister_WMDE
	Feb 28 2023, 1:54 PM

Description

The primary branch in the Wikidata Query Builder deployment repo is production, which is automatically deployed via Puppet. But it also has a master branch:

The branch is quite outdated, and seems to be left over from the initial work in the deployment repo (T266703), before we switched the branch (though I don’t understand the “To avoid constant merge conflicts” comment). Puppet has cloned the production branch since the initial setup there. I propose that we delete the branch to avoid confusion. (Note that HEAD still points at master – we should move that to production too.)

See also the comments of T254027, where the master branch of the similar wikidata/query/gui-deploy repository was deleted.

Related Objects

Mentioned Here: T254027: Can we scrap the `wikidata/query/gui-deploy` repo, or is it being used?
T266703: Deploy query builder to microsites (on top of the wdqs-ui)

Event Timeline

Lucas_Werkmeister_WMDE created this task.Feb 28 2023, 1:54 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptFeb 28 2023, 1:54 PM

Maintenance_bot moved this task from Inbox to Sorted Team A on the [DEPRECATED] wdwb-tech board.Feb 28 2023, 2:15 PM

To clarify, it is for the Gerrit wikidata/query-builder/deploy repository which has:

https://gerrit.wikimedia.org/r/admin/repos/wikidata/query-builder/deploy,branches

Ref	Pointer	commit
HEAD	master	None, it is a symbolic ref
master	ed287d58a1e9a2ea39f2eb5bbba31d8fc54269c2	August 2021
production	23eaa789c17daf9b7d597188fa83b59524a073c2	Feb 2023

Note that master has forked somehow or is an history rewrite of some sort:

* ad20ad9 - Merging from 33e97cc6fc3303f1c917022aaaf33dd1926fffed (1 year, 6 months ago) <Michael Große>
* fc4ecde - Merging from eaf72622042c946bc67042cb8c8bff9ce13490b3 (1 year, 6 months ago) <WDQSGuiBuilder>
* c7accea - Initial build (1 year, 7 months ago) <Amir Sarabadani>
| * ed287d5 - (HEAD -> master, origin/master, origin/HEAD) Merging from 33e97cc6fc3303f1c917022aaaf33dd1926fffed (1 year, 7 months ago) <Michael Große>
| * 5c3e8f9 - Merging from eaf72622042c946bc67042cb8c8bff9ce13490b3 (1 year, 7 months ago) <WDQSGuiBuilder>
| * 2e71fd5 - Initial build (1 year, 7 months ago) <Amir Sarabadani>
|/  
* b78d654 - Add .gitreview (1 year, 7 months ago) <Amir Sarabadani>
* e8f25e0 - Initial empty repository (1 year, 7 months ago) <Ladsgroup>

I am happy to assist if needed, but as a repository owner you should be able to adjust the HEAD branch from master to production via https://gerrit.wikimedia.org/r/admin/repos/wikidata/query-builder/deploy,branches . If needed we can add an access list to the repository to prevent further changes to the production branch though I am not entirely sure about the access list that has to be put in place :]

Yeah, I seem to have the required access at https://gerrit.wikimedia.org/r/admin/repos/wikidata/query-builder/deploy,branches, just wanted to wait a bit before making the change (and have a task for tracking it) :) if nobody objects I’ll probably self-service this within a few days.

I think that this is a good idea. 👍

Michael awarded a token.Mar 1 2023, 2:50 PM

Mentioned in SAL (#wikimedia-releng) [2023-03-02T12:39:16Z] <Luca> wikidata/query-builder/deploy.git: changed HEAD from master to production # T330752

Mentioned in SAL (#wikimedia-releng) [2023-03-02T12:41:10Z] <Lucas_WMDE> wikidata/query-builder/deploy.git: deleted master branch (was ed287d58a1e9a2ea39f2eb5bbba31d8fc54269c2 ) # T330752

In T330752#8660288, @Stashbot wrote:

Mentioned in SAL (#wikimedia-releng) [2023-03-02T12:39:16Z] <Luca> wikidata/query-builder/deploy.git: changed HEAD from master to production # T330752

(That was also me, my IRC nick was just not set correctly and I didn’t realize.)

Done, I think :)

Remove master branch from wikidata/query-builder/deploy.gitClosed, ResolvedPublicActions

Description

Related Objects

Event Timeline

Remove master branch from wikidata/query-builder/deploy.git
Closed, ResolvedPublic
Actions