This repository has been archived by the owner on Dec 2, 2020. It is now read-only.
Restore homebrew-versions for gcc #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ok, I'll change back the naming convention back to
edit: I'll just revert it on master. |
|
@rafaelfranca I've set the naming convention back and reverted your commit. I think this is still a valid PR to be merged in. This sets the |
|
🤦 sorry about the bad revert, my mistake. |
|
I'm going to push some changes to this branch |
|
ok |
This reverts commit b7b9485. Conflicts: spec/classes/gcc_spec.rb
|
I believe it is correct now. Could you check? |
|
Your changes look good to me, I'm going to run a fresh boxen install with the new version of this module on an OSX 10.9 VM that I have just to make sure everything works alright. |
|
@rafaelfranca your changes have a new error I'm not sure I understand your change here -> 46a4053 This is the # This file manages Puppet module dependencies.
#
# It works a lot like Bundler. We provide some core modules by
# default. This ensures at least the ability to construct a basic
# environment.
# Shortcut for a module from GitHub's boxen organization
def github(name, *args)
options ||= if args.last.is_a? Hash
args.last
else
{}
end
if path = options.delete(:path)
mod name, :path => path
else
version = args.first
options[:repo] ||= "boxen/puppet-#{name}"
mod name, version, :github_tarball => options[:repo]
end
end
# Shortcut for a module under development
def dev(name, *args)
mod name, :path => "#{ENV['HOME']}/src/boxen/puppet-#{name}"
end
# Includes many of our custom types and providers, as well as global
# config. Required.
github "boxen", "3.6.2"
# Support for default hiera data in modules
github "module-data", "0.0.3", :repo => "ripienaar/puppet-module-data"
# Core modules for a basic development environment. You can replace
# some/most of these if you want, but it's not recommended.
github "dnsmasq", "1.0.1"
github "foreman", "1.2.0"
dev "gcc", :ref => "fix-gcc48-formula"
github "git", "2.5.0"
github "go", "1.1.0"
github "homebrew", "1.9.4"
github "hub", "1.3.0"
github "inifile", "1.0.3", :repo => "puppetlabs/puppetlabs-inifile"
github "nginx", "1.4.3"
github "nodejs", "3.8.1"
github "openssl", "1.0.0"
github "phantomjs", "2.3.0"
github "pkgconfig", "1.0.0"
github "repository", "2.3.0"
github "ruby", "8.1.2"
github "stdlib", "4.2.1", :repo => "puppetlabs/puppetlabs-stdlib"
github "sudo", "1.0.0"
github "xquartz", "1.1.1"
# Optional/custom modules. There are tons available at
# https://github.com/boxen |
|
The formula we use is the homebrew-version formula. That formula uses those packages from homebrew-version too. We do this because gcc-42 and gcc-48 has the same dependencies in different versions. |
|
That makes sense. In that case, I will go ahead and make a new branch with your changes and see if that clears up the issue. I used this file as the new template which is probably why I'm getting errors. |
|
@rafaelfranca I have reverted As this PR stands right now, this works on a fresh boxen install. Thank you again for your patience. I always appreciate you taking the time to help me understand how this project functions. |
|
@rafaelfranca is there anything else I should add to this PR? |
|
|
tarebyte
added a commit
that referenced
this pull request
Jul 21, 2014
Restore homebrew-versions for gcc
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This closes #7
I also changed the naming convention of the file to fit homebrew
/cc @dgoodlad @fromonesrc @rafaelfranca