Skip to content

Commit

Permalink
Fix bundler on Travis (#305)
Browse files Browse the repository at this point in the history
* Fix bundler on Travis

Travis needs some additional coaxing with rvm to properly update
bundler.

Signed-off-by: Adam Leff <adam@leff.co>

* Bundler now a default gem and cannot be uninstalled

Signed-off-by: Adam Leff <adam@leff.co>

* Hardcode profile list in compliance suite

Incorrect use of YAML alias, which new TK version complains about,
probably due to some new save_eval thing.

Signed-off-by: Adam Leff <adam@leff.co>
  • Loading branch information
adamleff authored Jan 22, 2018
1 parent 0e9a6e4 commit 49a3e73
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,12 @@ suites:
server: <%= ENV['COMPLIANCE_API'] %>
token: <%= ENV['COMPLIANCE_ACCESSTOKEN'] %>
owner: admin
profiles: *profiles
profiles:
- name: ssh-hardening
url: https://github.com/dev-sec/tests-ssh-hardening/archive/master.zip
- git: https://github.com/dev-sec/tests-ssh-hardening.git
- name: ssh-baseline
supermarket: dev-sec/ssh-baseline
- name: gem-install-version
run_list:
- recipe[test_helper::install_inspec]
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ dist: trusty
services:
- docker
before_install:
- gem install bundler
- gem update --system
- gem --version
- bundle --version
matrix:
include:
- rvm: 2.2
Expand Down

0 comments on commit 49a3e73

Please sign in to comment.