-
Notifications
You must be signed in to change notification settings - Fork 102
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
ENT-10656: Added missing build steps to repository module to align with CFEngine Build index #2732
Conversation
@olehermanse I am not sure what to set It influences not only the version string for the policy itself ( |
@nickanderson IMO, it would be wrong to set an exact version here explicitly, when you are between versions your version number should reflect this. If we want the self upgrade policy to handle this better, that's what needs to be fixed, I think. |
… Build index Now if you cfbs add https://github.com/cfengine/masterfiles you will get the same build steps as those used when you cfbs add masterfiles from the CFEngine Build index. Note: EXPLICIT_VERSION and EXPLICIT_RELEASE are not set here, this not only affects the version of the policy, but also the default binary version to target during self upgrade. Ticket: ENT-10656 Changelog: Title Co-authored-by: Ole Herman Schumacher Elgesem <[email protected]>
cb30c9a
to
b89489c
Compare
"steps": ["run ./prepare.sh -y", | ||
"delete cfe_internal/core/watchdog/README.md", | ||
"delete cfe_internal/enterprise/ha/ha_info.json", | ||
"delete .github", | ||
"delete inventory/README.md", | ||
"delete lib/README.md", | ||
"delete LICENSE", | ||
"delete modules/promises", | ||
"delete .no-distrib", | ||
"delete services/autorun/README.md", | ||
"delete templates/README.md", | ||
"copy ./ ./"] |
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.
@nickanderson actually, this is not needed. The current (newest) version of prepare.sh has all of these deletes inside of it.
See:
Lines 61 to 100 in 998f71d
aclocal.m4 | |
autogen.sh | |
autom4te.cache | |
CFRELEASE | |
.CFVERSION | |
CFVERSION | |
CHANGELOG.md | |
CODE_OF_CONDUCT.org | |
config.guess | |
config.log | |
config.status | |
config.sub | |
configure | |
configure.ac | |
CONTRIBUTING.md | |
example_def.json | |
.git | |
.gitignore | |
install-sh | |
m4 | |
.mailmap | |
Makefile | |
Makefile.am | |
Makefile.in | |
misc | |
missing | |
MPF.md | |
README.md | |
test-driver | |
tests | |
cfe_internal/core/watchdog/README.md | |
cfe_internal/enterprise/ha/ha_info.json | |
.github | |
inventory/README.md | |
lib/README.md | |
LICENSE | |
modules/promises | |
.no-distrib | |
services/autorun/README.md | |
templates/README.md |
This matches the latest version in the index (3.22 non LTS, which is not the default, since we default to latest LTS):
So I guess the latest improvements to the prepare.sh
script have not been backported to 3.21.x. Feel free to do this, to prepare mpf for the upcoming 3.21 release, if you'd like.
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.
Looks like that backporting has also been done already: #2643
Now if you cfbs add https://github.com/cfengine/masterfiles you will get the
same build steps as those used when you cfbs add masterfiles from the CFEngine
Build index.
Ticket: ENT-10656
Changelog: Title