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.

Sign up for GitHub

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

Jump to bottom

CFE-4527: Change delete step and init --masterfiles behavior #159

Merged
merged 3 commits into from
Sep 21, 2023
Merged

CFE-4527: Change delete step and init --masterfiles behavior #159

merged 3 commits into from
Sep 21, 2023

Conversation

craigcomstock
Copy link
Contributor

  • Changed delete step behavior to allow for non-existent paths
  • Changed init --masterfiles implementation to add with commit instead of modify index version of masterfiles module

larsewi
larsewi requested changes Sep 21, 2023
View reviewed changes
Copy link
Contributor

@larsewi larsewi left a comment

Choose a reason for hiding this comment

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

Nice work 🚀

cfbs/utils.py Outdated Show resolved Hide resolved
@craigcomstock
Changed delete step behavior to allow for non-existent paths
3841df8 
Before this would cause an assert, stacktrace and abort of the program.

Now it causes a warning:

WARNING: delete: path 'out/steps/001_masterfiles_793214c10cd0d1f31e8ca44ab05790554776772a/templates/README.md' does not exist, skipping

Ticket: CFE-4257
Changelog: title
@craigcomstock
Changed init --masterfiles implementation to add with commit instead …
b451f92 
…of modify index version of masterfiles module

Previously, if the alternate masterfiles branch/commit had different steps they would not be included in cfbs.json

Ticket: CFE-4257
Changelog: title
larsewi
larsewi approved these changes Sep 21, 2023
View reviewed changes
Copy link
Contributor

@larsewi larsewi left a comment

Choose a reason for hiding this comment

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

ACK

olehermanse
olehermanse reviewed Sep 21, 2023
View reviewed changes
cfbs/utils.py Outdated Show resolved Hide resolved
@craigcomstock @olehermanse
Update cfbs/utils.py
8b910a2 
Co-authored-by: Ole Herman Schumacher Elgesem <[email protected]>
@olehermanse olehermanse merged commit f6f8cbf into cfengine:master Sep 21, 2023
6 of 7 checks passed
@craigcomstock craigcomstock deleted the CFE-4257 branch September 21, 2023 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@larsewi larsewi larsewi approved these changes

@olehermanse olehermanse olehermanse approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@craigcomstock @olehermanse @larsewi