Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cherry picking missing commits from sylabs sif repo #245

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

JasonYangShadow
Copy link
Member

@JasonYangShadow JasonYangShadow commented Nov 5, 2024

cherry picking missing commits from the sylabs sif repo and re-implementing as required.

cherry picked commits include but not limited to:

  1. 096293c: chore: bump module Go version to 1.21 sylabs/sif@096293c (chore: bump module Go version to 1.21 sylabs/sif#351)
  2. 7ad27b6: refactor: simplify slice logic sylabs/sif@7ad27b6 (chore: bump module Go version to 1.21 sylabs/sif#351)
  3. df206d4: refactor: simplify minID calculation sylabs/sif@df206d4 (chore: bump module Go version to 1.21 sylabs/sif#351)
  4. 84ca397: refactor: split add/del/set code into files sylabs/sif@84ca397 (refactor: split add/del/set code into files sylabs/sif#364)
  5. b85400b: feat: add SetOCIBlobDigest sylabs/sif@b85400b (feat: add SetOCIBlobDigest sylabs/sif#365)
  6. fc6a037: refactor: use DSSE wrappers from sigstore sylabs/sif@fc6a037 (refactor: use DSSE wrappers from sigstore sylabs/sif#366)
  7. 8783e3b: refactor: improve compaction logic for AddObject sylabs/sif@8783e3b (refactor: improve compaction logic sylabs/sif#373)
  8. e8dad67: refactor: improve delete compaction logic sylabs/sif@e8dad67 (refactor: improve compaction logic sylabs/sif#373)
  9. 68683b4: feat: add DeleteObjects sylabs/sif@68683b4 (feat: add DeleteObjects sylabs/sif#374)
  10. d2a9ddc: fix: address lint with golangci-lint v1.60 sylabs/sif@d2a9ddc (chore: bump golangci-lint to v1.60 sylabs/sif#383)
  11. c1fcc37: fix: correct the range check for descriptor IDs sylabs/sif@c1fcc37 (fix: correct the range check for descriptor IDs sylabs/sif#384)
  12. 6f00aba: fix: check descriptor capacity during SIF creation sylabs/sif@6f00aba (fix: correct the range check for descriptor IDs sylabs/sif#384)
  13. 0d09c53: ci: bump golangci-lint to v1.61 sylabs/sif@0d09c53 (ci: bump golangci-lint to v1.61 sylabs/sif#386)
  14. faccf54: build(deps): bump github.com/sigstore/sigstore from 1.8.9 to 1.8.10 sylabs/sif@faccf54 (build(deps): bump github.com/sigstore/sigstore from 1.8.9 to 1.8.10 sylabs/sif#387)

Co-authored-by: Adam Hughes <[email protected]>
Signed-off-by: jason yang <[email protected]>
Copy link
Contributor

@DrDaveD DrDaveD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the description to link to all the PRs that you are importing.

I would prefer to see a separate commit corresponding to each sylabs/sif commit but I don't want to make you go through all the work again this time.

@JasonYangShadow
Copy link
Member Author

Please update the description to link to all the PRs that you are importing.

I would prefer to see a separate commit corresponding to each sylabs/sif commit but I don't want to make you go through all the work again this time.

I actually cherry-picking and re-implementing from git diff result. Anyway, I will try including the missing commits.

@DrDaveD
Copy link
Contributor

DrDaveD commented Nov 7, 2024

Also please link to the PRs, so github will show the connections.

@JasonYangShadow
Copy link
Member Author

Also please link to the PRs, so github will show the connections.

added. thanks!

@DrDaveD DrDaveD merged commit d1e39c2 into apptainer:main Nov 8, 2024
2 checks passed
@DrDaveD
Copy link
Contributor

DrDaveD commented Nov 8, 2024

This catches up to the level of v2.19.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants