-
Notifications
You must be signed in to change notification settings - Fork 148
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 and Update foreman_supervisory_authority dependencies #11157
Add and Update foreman_supervisory_authority dependencies #11157
Conversation
Can one of the admins verify this patch? |
1 similar comment
Can one of the admins verify this patch? |
ok to test |
I think you added the new packages manually instead of using the script, so they are missing from package_manifest.yaml and comps/*. |
I used the script but my Mac kind of complaint about something. I check that and push again, thanks for testing! |
@dgoetz , should ./add_gem_package.sh add them to package_manifest.yaml? |
Yes, there is a function |
Add rubygem-base64 package -> dependency for rubygem-llhttp-ffi Add rubygem-llhttp-ffi package -> dependency for http Bump rubygem-http to 5.2.0-1 Bump rubygem-http-form_data to 2.3.0-1
3a60896
to
a132643
Compare
Repoclosure now fails with
So with base64 being 0.2.0, llhttp-ffi 0.5.0, and http-form_data 2.3.0, this is a problem of order. Not sure if you need to split up the PR once more or having the packages in single commits in correct order would be enough (this is what I typically do). |
Ahh I see the problem. If I think about the order I will probably need to open multiple PR when I understand correctly the dependencies need to already be in the repository. So Single PRs it is. I would like to leave this PR Open, include the links to the new PRs and close it after the new PRs have been merged. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you may be right we need all dependencies satisfied before repoclosure can work. I thought we grouped them, but now that I take a closer look we don't.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't add base64. #11119 works at documenting how you should deal with it. I left other comments below with more specific examples.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary: HTTP should be easy | ||
Group: Development/Languages | ||
License: MIT | ||
URL: https://github.com/httprb/http | ||
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please prefer the default ruby gems when possible
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem | |
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem | |
Requires: (rubygem(base64) >= 0.1 or ruby-default-gems < 3.4) |
%{?scl:scl enable %{scl} - << \EOF} | ||
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec | ||
%{?scl:EOF} | ||
%setup -q -n %{gem_name}-%{version} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And then drop the base64 dependency here:
%setup -q -n %{gem_name}-%{version} | |
%setup -q -n %{gem_name}-%{version} | |
%gemspec_remove_dep -g base64 '~> 0.1' |
%exclude %{gem_instdir}/.gitignore | ||
%exclude %{gem_instdir}/.rubocop.yml | ||
%exclude %{gem_instdir}/.travis.yml | ||
%{gem_instdir}/.rubocop |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
%{gem_instdir}/.rubocop | |
%exclude %{gem_instdir}/.rubocop |
# The directory structure is very special and | ||
# does not really align with any other package |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see what's so different. This looks fairly standard to me for a gem with native extensions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why it gets sorted very different. We try to set the locale for consistent sorting but perhaps you don't have that locale installed?
foreman-packaging/comps_doc.sh
Line 6 in 9aeba42
export LC_COLLATE=en_GB.UTF-8 |
Add base64-0.2.0 as dependency for llhttp-ffi
Update http to 5.2.0
Update http-form_data to 2.3.0
Add llhttp-ffi-0.5.0 as dependency for http