Skip to content

ci/cfengine-build-host-setup.cf: Reformatted with cfengine format#2166

Closed
olehermanse wants to merge 1 commit intocfengine:masterfrom
olehermanse:reformat
Closed

ci/cfengine-build-host-setup.cf: Reformatted with cfengine format#2166
olehermanse wants to merge 1 commit intocfengine:masterfrom
olehermanse:reformat

Conversation

@olehermanse
Copy link
Copy Markdown
Member

Reformatting this file as a practical test and something to review and discuss.

Reformatting this file as a practical test and something to review
and discuss.

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
@olehermanse olehermanse marked this pull request as draft April 8, 2026 20:34
Comment on lines +245 to +250
"python3-rpm-macros"
->
{
"provides macro py3_shebang_fix needed in rhel-8 for /var/cfengine/bin/cfbs",
"ENT-11338"
}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Room for improvement.

Comment on lines +208 to +210
"xfsprogs";
# note that shellcheck, fakeroot and ccache require epel-release to be installed
# epel-release is installed by distribution package in rhel-7 and by URL for rhel-8+ later in commands section
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Interesting case, I think the comments should be indented one more level in this case.

Comment on lines 53 to 73
"debhelper";

"dpkg-dev";

"expat";

"fakeroot";

"flex";

"gdb";

"libexpat1-dev";

"libmodule-load-conditional-perl";

"libpam0g-dev";

"pkg-config";

"psmisc";
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We could make it so when there are multiple single line promises in a row, they will not be separated by empty newlines.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

yeah, those being next to each other would be much better/easier to read and manage.


# I attempted to arrange these packages in order of: generic (all versions) and then as if we gradually added them through time: rhel-6, 7, 8, 9...
"podman";
# I attempted to arrange these packages in order of: generic (all versions) and then as if we gradually added them through time: rhel-6, 7, 8, 9...
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Indent one more level.

"libxml2-dev" package_policy => "delete";
"librsync-dev" package_policy => "delete";
"libattr1-dev"
package_policy => "delete";
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I would not prefer these to be on separate lines. Much easier to manage/edit and as-is not that long.

@olehermanse olehermanse closed this Apr 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants