Page MenuHomeSoftware Heritage

gitlab: Allow listing of instances providing multiple vcs_type [PLEASE DELETE ME]
AbandonedPublicDraft

Authored by borisbaldassari on Sat, Oct 2, 9:06 PM.

Details

Summary

Would you mind deleting this revision? This is another (failed) try at cleaning up the commits after review D6133.
The new revision https://forge.softwareheritage.org/D6395 seems to be successful, though.
Thanks for your patience.

Diff Detail

Repository
rDLS Listers
Branch
T1724_maven_central_lister_reviewed
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 24168
Build 37721: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 37720: arc lint + arc unit

Event Timeline

Build has FAILED

Patch application report for D6394 (id=23251)

Rebasing onto e7716c0122...

First, rewinding head to replay your work on top of it...
Applying: gitlab: Allow listing of instances providing multiple vcs_type
Using index info to reconstruct a base tree...
M	swh/lister/gitlab/lister.py
M	swh/lister/gitlab/tests/test_lister.py
Falling back to patching base and 3-way merge...
Auto-merging swh/lister/gitlab/tests/test_lister.py
CONFLICT (content): Merge conflict in swh/lister/gitlab/tests/test_lister.py
Auto-merging swh/lister/gitlab/lister.py
CONFLICT (content): Merge conflict in swh/lister/gitlab/lister.py
Patch failed at 0001 gitlab: Allow listing of instances providing multiple vcs_type

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto e7716c0122...

Already up to date.
Changes applied before test
commit 52d620d729aeda74aaa61736a4c13be464a9d404
Author: Boris Baldassari <boris@chrysalice.org>
Date:   Sat Oct 2 21:04:20 2021 +0200

    maven-lister: Add maven lister with review D6133.

Link to build: https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/383/
See console output for more information: https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/383/console

Harbormaster returned this revision to the author for changes because remote builds failed.Sat, Oct 2, 9:09 PM
Harbormaster failed remote builds in B24168: Diff 23251!

Ok, I give up sorry. I wanted to create a new clean diff with only the maven-lister stuff, but I can't manage to get that right.
Can someone help please?

As for the content: this is the follow-up of D6133.
I think everything has been fixed -- excepted one comment, marked as not Done in the previous review for it needs some clarification.

borisbaldassari retitled this revision from gitlab: Allow listing of instances providing multiple vcs_type to gitlab: Allow listing of instances providing multiple vcs_type [PLEASE DELETE ME].Sat, Oct 2, 9:24 PM
borisbaldassari edited the summary of this revision. (Show Details)