Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

[WIP - Don't close] Travis workaround #3

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
548e4df
added subcommand keypairs to list SSH key pairs
berendt Apr 16, 2014
43d3ec2
added subcommand networks to list networks
berendt Apr 16, 2014
b47fb59
added subcommand servers to list servers
berendt Apr 16, 2014
1a43a28
rewrote the custom commands section
berendt May 8, 2014
8b4f486
added column Network ID to the network list
berendt May 8, 2014
cebafef
Confirm Rackspace server destruction.
dkinzer Jul 24, 2014
5561c1a
Merge pull request #116 from dkinzer/confirm-before-destroy
smashwilson Jul 24, 2014
f3524d9
Merge pull request #116 from dkinzer/confirm-before-destroy
smashwilson Jul 24, 2014
1a883fd
Merge pull request #117 from dkinzer/fix-no-message-error
smashwilson Jul 24, 2014
2f9adca
Merge pull request #90 from berendt/subcommand_list_keys
smashwilson Jul 24, 2014
2a7c9a9
Merge branch 'subcommand_list_networks' of github.com:berendt/vagrant…
smashwilson Jul 24, 2014
8c6fb55
Merge branch 'berendt-subcommand_list_networks'
smashwilson Jul 24, 2014
17adfce
Merge branch 'subcommand_list_servers' of github.com:berendt/vagrant-…
smashwilson Jul 24, 2014
e93c970
Merge branch 'berendt-subcommand_list_servers'
smashwilson Jul 24, 2014
caf52ca
Merge pull request #94 from berendt/rewrite_custom_commands
smashwilson Jul 24, 2014
48fcda5
Sample Vagrantfile that includes Ubuntu, CentOS, and Windows servers
maxlinc Dec 9, 2014
65ef6f1
Generic communicator variable for either ssh or winrm
maxlinc Dec 9, 2014
4e4dcf5
Support for init_script
maxlinc Dec 9, 2014
7c6af4c
Sample init_script for WinRM setup
maxlinc Dec 9, 2014
69a7054
Fixed doc typo
maxlinc Dec 9, 2014
82da93a
Merge pull request #124 from maxlinc/init_script
smashwilson Dec 9, 2014
1a756f9
README update [ci skip]
maxlinc Dec 9, 2014
0a4315a
Appraisal setup including windows WIP fork
maxlinc Nov 9, 2014
9805ae6
Better winrm messages
maxlinc Dec 9, 2014
1d4733f
Don't upload SSH keys unless communicator is ssh
maxlinc Dec 9, 2014
34833c5
Make appraisal work with plugins group
maxlinc Dec 9, 2014
ecebc21
Merge pull request #108 from maxlinc/winrm_msgs
smashwilson Dec 16, 2014
1793481
Set box_optional and parallel attributes
maxlinc Dec 15, 2014
1fbb603
Report progress, scoped by machine
maxlinc Dec 16, 2014
653878a
Merge pull request #128 from maxlinc/attributes
smashwilson Dec 16, 2014
57ec21e
v0.1.10
smashwilson Dec 16, 2014
3144f2e
v0.1.11dev
smashwilson Dec 16, 2014
3689cd4
Update gemfiles
maxlinc Dec 16, 2014
fd1b29b
Update travis config - no more Ruby 1.9.3
maxlinc Dec 16, 2014
9daf6fa
README updates
maxlinc Dec 16, 2014
646c319
Only test Windows on Vagrant 1.6+
maxlinc Dec 16, 2014
15abef8
Use built-in actions for SyncedFolders and WaitForCommunicator
maxlinc Dec 16, 2014
b29b84b
Fix commands that were lost in a merge...
maxlinc Dec 16, 2014
17f6f1e
Fix logger name
maxlinc Dec 17, 2014
03631f4
Fix README typos
maxlinc Dec 17, 2014
1af3f6f
Travis matrix: match Vagrant versions to their supported Ruby version
maxlinc Dec 18, 2014
da6ec3c
Don't install pry or appraisal on travis
maxlinc Dec 18, 2014
a1dbf5d
Fix gemfiles
maxlinc Dec 18, 2014
05263b0
Use specific bundler versions
maxlinc Dec 18, 2014
ad26249
Quite gem install argument
maxlinc Dec 18, 2014
7b2275f
Remove existing bundler gems
maxlinc Dec 18, 2014
658859a
Try removing it from rvm global gemset as well...
maxlinc Dec 18, 2014
c03298f
OK removing executables
maxlinc Dec 18, 2014
643e1e3
Merge pull request #129 from maxlinc/upgrade
smashwilson Jan 14, 2015
c8529c8
Add `rackspace_region` configuration to sample config
zacharydanger Mar 5, 2015
7a9865d
Merge pull request #1 from zacharydanger/patch-1
hlecuanda Mar 12, 2015
b8aed7e
Example showing best practice of keeping API KEY private
hlecuanda Mar 12, 2015
6b4b84d
Clarified environment setup for multi-machine vagrant file
hlecuanda Mar 12, 2015
9f6e376
Clarified flow. Keeping the API key private shoud not be optional
hlecuanda Mar 12, 2015
af92a09
Changed env variable names to be consistent with provided Vagrantfile
hlecuanda Mar 12, 2015
22237e1
Merge pull request #136 from hlecuanda/master
smashwilson Sep 24, 2015
54571c0
Update README.md
trizko Jan 15, 2016
dcbc254
Merge pull request #144 from trizko/patch-1
smashwilson Jan 15, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 32 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
script: "appraisal rake"
gemfile:
- Gemfile
- gemfiles/latest_stable.gemfile
- gemfiles/oldest_current.gemfile
- gemfiles/previous_release.gemfile

before_install:
- rvm @global do gem uninstall bundler --all --force --executables
- gem uninstall bundler --all --force --executables
- gem install bundler -v "$BUNDLER_VERSION"
bundler_args: --without development
matrix:
include:
- gemfile: Gemfile
rvm: 2.1.1 # Just to make sure we're ready...
env:
BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
- gemfile: Gemfile
rvm: 2.0.0
env:
BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
- gemfile: gemfiles/vagrant_1.7.gemfile
rvm: 2.0.0
env:
BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
- gemfile: gemfiles/vagrant_1.6.gemfile
rvm: 2.0.0
env:
BUNDLER_VERSION='>= 1.5.2, < 1.7.0'
- gemfile: gemfiles/vagrant_1.5.gemfile
rvm: 2.0.0
env:
BUNDLER_VERSION='= 1.5.2'
# The oldest Vagrant/Ruby/Bundler we support
- gemfile: gemfiles/vagrant_1.5.0.gemfile
rvm: 2.0.0
env:
BUNDLER_VERSION='= 1.5.2'
38 changes: 30 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@
appraise "latest-stable" do
gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.2'
# Note: You may need to use bundler 1.5.2 to run `appraisal install`
appraise "vagrant-1.7" do
group :plugins do
gem 'bundler', '>= 1.5.2', '< 1.8.0'
gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.7.1'
end
end

# Oldest (current release)
appraise "oldest-current" do
gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.0'
appraise "vagrant-1.6" do
gem 'bundler', '>= 1.5.2', '< 1.7.0'
group :plugins do
gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.6.5'
end
end

# Latest patch (previous release)
appraise "previous-release" do
gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.3.5'
appraise "vagrant-1.5" do
gem 'bundler', '= 1.5.2'
group :plugins do
gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
end
end

# Oldest supported
appraise "vagrant-1.5.0" do
gem 'bundler', '= 1.5.2'
group :plugins do
gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
end
end

appraise "windows-wip" do
group :plugins do
gem "vagrant", :git => 'https://github.com/maxlinc/vagrant', :branch => 'winrm-1.3'
end
end

23 changes: 11 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
source 'https://rubygems.org'


group :plugins do
gemspec
gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant'
# This group will not be installed on Travis
group :development do
gem 'pry'
# My branch contains a fix for https://github.com/thoughtbot/appraisal/issues/76
gem 'appraisal', '~> 1.0', git: 'https://github.com/maxlinc/appraisal', branch: 'gemspec_in_group'
end

gem "appraisal", "1.0.0.beta2"

group :development do
# We depend on Vagrant for development, but we don't add it as a
# gem dependency because we expect to be installed within the
# Vagrant environment itself using `vagrant plugin`.
group :test do
gem 'coveralls', require: false
gem 'pry'
end


group :plugins do
gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :branch => 'master'
gemspec
end

Loading