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

Add sha256 field in package file #1141

Merged

Conversation

valentinmanea
Copy link
Contributor

@valentinmanea valentinmanea commented Jul 9, 2024

Added the sha256 field in PackageFile class

Fixes: #1142

@valentinmanea valentinmanea changed the base branch from main to 6.x July 9, 2024 14:00
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please add a value in the example file package-files.json. This way we are sure the serialisation/deserialisation code works (tested in the TestGitLabApiBeans unit test)

@jmini jmini force-pushed the 6.x_add_sha256_field_in_package_file branch from 6ccd100 to c832613 Compare August 7, 2024 07:22
@jmini jmini changed the base branch from 6.x to main August 7, 2024 07:22
@jmini
Copy link
Collaborator

jmini commented Aug 7, 2024

I have rebased the source branch of this PR (6.x_add_sha256_field_in_package_file in the valentinmanea fork) on top of main of this repo:

git rebase --onto origin/main origin/6.x
git push valentinmanea HEAD:6.x_add_sha256_field_in_package_file --force

Be aware that your local branch 6.x_add_sha256_field_in_package_file has diverged with the one on the GitHub.

If you need to do one more changes on this branch:
I recommend to use git fetch and git reset --hard origin/6.x_add_sha256_field_in_package_file (assuming your local origin is pointing to the valentinmanea fork on GitHub) before doing any local modifications instead of git pull.

I have changed the target branch of this PR to be main

@jmini jmini changed the title 6.x add sha256 field in package file Add sha256 field in package file Aug 7, 2024
@valentinmanea
Copy link
Contributor Author

@jmini Can you merge this ?

@jmini
Copy link
Collaborator

jmini commented Aug 8, 2024

I have been fighting CI, because of the flakiness of some integrations tests. But now it is good.

@jmini jmini merged commit 7a224e3 into gitlab4j:main Aug 8, 2024
1 check passed
@jmini
Copy link
Collaborator

jmini commented Aug 8, 2024

I have merged your change to main and 6.x. 🎉

Thank you very much for this contribution.

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.

Missing file sha256 filed in PackageFile object
2 participants