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

(PDK-1100) Exclude known artifacts from build instead of cleaning #575

Merged
merged 1 commit into from
Oct 3, 2018

Conversation

rodjek
Copy link
Contributor

@rodjek rodjek commented Oct 3, 2018

By handling it in this manner, we can remove the need to call the PDK shipped spec_clean task. This is the only dependency on the PDK runtime environment when calling PDK::Module::Build.invoke from outside of PDK (as needs to be done in puppetlabs_spec_helper's build rake task).

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 92.914% when pulling 824abb5 on rodjek:pdk-1100 into 1c30b4f on puppetlabs:master.

@rodjek rodjek requested review from scotje and bmjen October 3, 2018 12:45
@@ -215,6 +213,8 @@ def ignored_files
ignored = ignored.add("\/#{File.basename(target_dir)}\/")
end

DEFAULT_IGNORED.each { |r| ignored.add(r) }
Copy link
Contributor

Choose a reason for hiding this comment

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

This will add duplicate entries to the ignore list if there are common ignores between the pmt/pdk/git ignore files and the defaults.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Duplicates shouldn't cause an issue (just as you can have duplicate entries in a .gitignore).

Copy link
Contributor

Choose a reason for hiding this comment

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

True, we don't currently clear dupes from the ignore file either.

# @return nil
def cleanup_module
PDK::Util::Bundler.ensure_bundle!
PDK::Util::Bundler.ensure_binstubs!('rake')
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this need to re-appear somewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, the purpose of this change is to remove the need for the in-module bundler environment when building release tarballs

@bmjen bmjen merged commit 810d1d3 into puppetlabs:master Oct 3, 2018
@rodjek rodjek deleted the pdk-1100 branch October 3, 2018 23:40
@bmjen bmjen added the feature label Oct 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants