Skip to content
Snippets Groups Projects

nixguix: Improve git origins detection

Without this, some git repositories are detected as file (due to upstream misqualification too). This does some extra effort to detect those to avoid sending noise to loaders.

This also refactors some common code to build vcs artifacts to avoid duplication.

Related to T3781 Depends on !435 (closed)


Migrated from D8620 (view on Phabricator)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Build is green

    Patch application report for D8620 (id=31123)

    Could not rebase; Attempt merge onto 944d4b5b...

    Updating 944d4b5..08be7a9
    Fast-forward
     swh/lister/nixguix/lister.py                       | 67 ++++++++++++++++------
     .../nixguix/tests/data/nixpkgs-swh_sources.json    |  7 +++
     swh/lister/nixguix/tests/test_lister.py            | 22 ++++++-
     3 files changed, 75 insertions(+), 21 deletions(-)
    Changes applied before test
    commit 08be7a91c51fa391bc4880123520103e532cebe5
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 4 23:25:20 2022 +0200
    
        nixguix: Improve git origins detection
        
        Without this, some git repositories are detected as file (due to upstream
        misqualification too). This does some extra effort to detect those to avoid sending
        noise to loaders.
        
        This also refactors some common code to build vcs artifacts to avoid duplication.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')
    
    commit c4c6df39e142648e066887f0ce6289974c99417d
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 4 20:42:20 2022 +0200
    
        nixguix: Improve tarball detection
        
        Without this, some tarballs hidden within query parameters are not detected. This does
        some extra effort to detect those to avoid sending noise to loaders.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')

    See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/752/ for more details.

  • Rebase

  • Build is green

    Patch application report for D8620 (id=31127)

    Could not rebase; Attempt merge onto 944d4b5b...

    Updating 944d4b5..ff80a91
    Fast-forward
     swh/lister/nixguix/lister.py                       | 85 ++++++++++++++++------
     .../nixguix/tests/data/nixpkgs-swh_sources.json    |  7 ++
     swh/lister/nixguix/tests/test_lister.py            | 22 +++++-
     3 files changed, 89 insertions(+), 25 deletions(-)
    Changes applied before test
    commit ff80a91f0af81a067ea2c455b7fd2750ff81761b
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 4 23:25:20 2022 +0200
    
        nixguix: Improve git origins detection
        
        Without this, some git repositories are detected as file (due to upstream
        misqualification too). This does some extra effort to detect those to avoid sending
        noise to loaders.
        
        This also refactors some common code to build vcs artifacts to avoid duplication.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')
    
    commit 2fbd66778f3286c77149796339426aeccd11c1d0
    Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
    Date:   Tue Oct 4 20:42:20 2022 +0200
    
        nixguix: Improve tarball detection
        
        Without this, some tarballs hidden within query parameters are not detected. This does
        some extra effort to detect those to avoid sending noise to loaders.
        
        Related to [T3781](https://forge.softwareheritage.org/T3781 'view original for T3781 on Phabricator')

    See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/754/ for more details.

  • Merge request was accepted

  • vlorentz approved this merge request

    approved this merge request

  • Merge request was merged

Please register or sign in to reply
Loading