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

(FACT-950) Unvendor leatherman #1236

Merged

Conversation

branan
Copy link

@branan branan commented Dec 15, 2015

This updates the CMake to assume leatherman needs to be found on the
system, and updates the travis build scripts to use an artifact
provided from a github release.

Merging this will require puppetlabs/leatherman#112, a to-be-released puppet-agent PR for adding the necessary leatherman component there, and an updated tag of leatherman so we'll have a github release and a good baseline for the P-A component

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch from 5bec703 to ecf8506 Compare December 15, 2015 18:35
@@ -15,11 +15,14 @@ install:
- ps: wget 'https://s3.amazonaws.com/kylo-pl-bucket/yaml-cpp-0.5.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$pwd\yaml-cpp.7z"
- ps: 7z.exe x yaml-cpp.7z -oC:\tools | FIND /V "ing "

- ps: wget 'https://github.com/puppetlabs/leatherman/releases/download/0.3.0/leatherman.7z' -OutFile "$pwd\facter.7z"

Choose a reason for hiding this comment

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

I'd lean towards using an environment variable here as well, see http://www.appveyor.com/docs/build-configuration#custom-environment-variables.

Copy link
Author

Choose a reason for hiding this comment

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

Thanks for that link, I'll update

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch from ecf8506 to 2a53935 Compare December 15, 2015 19:04
@branan
Copy link
Author

branan commented Dec 15, 2015

I cancelled the test runs since they'll fail anyway until we get leatherman tagged and archives released

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch from 2a53935 to 132620a Compare December 16, 2015 23:21
@@ -15,11 +17,14 @@ install:
- ps: wget 'https://s3.amazonaws.com/kylo-pl-bucket/yaml-cpp-0.5.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$pwd\yaml-cpp.7z"
- ps: 7z.exe x yaml-cpp.7z -oC:\tools | FIND /V "ing "

- ps: wget 'https://github.com/puppetlabs/leatherman/releases/download/%LEATHERMAN_VERSION%/leatherman.7z' -OutFile "$pwd\facter.7z"

Choose a reason for hiding this comment

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

This is a powershell command, %LEATHERMAV_VERSION% is the wrong syntax. You should use double quotes and $LEATHERMAN_VERSION.

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch 7 times, most recently from 9ec4ef1 to e79229c Compare December 17, 2015 00:08
@MikaelSmith
Copy link

Pushed Leatherman 0.3.2

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch 2 times, most recently from bf421e5 to 72c6ec1 Compare December 17, 2015 00:58
@MikaelSmith
Copy link

This one might actually work.

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch from 72c6ec1 to 1d36310 Compare December 17, 2015 01:10
@branan
Copy link
Author

branan commented Dec 17, 2015

Once we get these tests passing, we still need puppetlabs/puppet-agent#454 before we can merge it, or we'll break everything internally

@branan
Copy link
Author

branan commented Dec 17, 2015

This needs #1237 so it doesn't try to install the boost nowide.dll. Otherwise it's getting through appveyor. I'll deal with that in the morning

@MikaelSmith
Copy link

If you want to pull the libnowide removal in, feel free.

@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch from 1d36310 to 01ac3f6 Compare December 17, 2015 18:43
@branan
Copy link
Author

branan commented Dec 17, 2015

@MikaelSmith it finally worked!

@kylog
Copy link

kylog commented Dec 30, 2015

Bump this to 0.3.4 of lth?

This updates the CMake to assume leatherman needs to be found on the
system, and updates the travis and appveyorbuild scripts to use an
artifact provided from a github release.
@branan branan force-pushed the feature/master/fact-950-unvendor-leatherman branch from 01ac3f6 to 3299b88 Compare December 31, 2015 18:19
@branan
Copy link
Author

branan commented Dec 31, 2015

@kylog bumped

@kylog
Copy link

kylog commented Dec 31, 2015

👍

We are almost (fingers crossed) at all-green on master after all the b-hg fun, so I'm going to be paranoid and hold off on merging to reduce variations until we have that green satisfaction.

kylog pushed a commit that referenced this pull request Dec 31, 2015
@kylog kylog merged commit fe24526 into puppetlabs:master Dec 31, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants