diff options
| author | Jared Quick <jquick@chef.io> | 2018-03-26 09:17:00 -0400 |
|---|---|---|
| committer | Jared Quick <jquick@chef.io> | 2018-03-26 14:18:34 -0400 |
| commit | 1065395824680c979c81761f8bfaae301e189946 (patch) | |
| tree | dd73a5316e01a56db1867909e4704b51938dcadd | |
| parent | 8b40f2984d478c00a6e7d8dc7a991c7b3cad181a (diff) | |
| download | chef-1065395824680c979c81761f8bfaae301e189946.tar.gz | |
Force unf_ext to 0.0.7.6 in Gemfile.
Signed-off-by: Jared Quick <jquick@chef.io>
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 7 |
3 files changed, 19 insertions, 3 deletions
@@ -11,6 +11,11 @@ gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.ex gem "cheffish", "~> 14" group(:omnibus_package) do + # override for unf_ext for inspec 2 until + # https://github.com/knu/ruby-unf_ext/pull/39 + # is merged and released + gem "unf_ext", "=0.0.7.6", :git => "https://github.com/jquick/ruby-unf_ext.git" + gem "appbundler" gem "rb-readline" gem "inspec", "~> 2" diff --git a/Gemfile.lock b/Gemfile.lock index 31c14aad43..7960939704 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,12 @@ GIT chefstyle (0.9.0) rubocop (= 0.54.0) +GIT + remote: https://github.com/jquick/ruby-unf_ext.git + revision: c0b3bd922214a172976f6f368c0b4e4fbf91ed78 + specs: + unf_ext (0.0.7.6) + PATH remote: . specs: @@ -366,9 +372,6 @@ GEM ethon (>= 0.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) - unf_ext (0.0.7.5-x64-mingw32) - unf_ext (0.0.7.5-x86-mingw32) unicode-display_width (1.3.0) uuidtools (2.1.5) webmock (3.3.0) @@ -439,6 +442,7 @@ DEPENDENCIES simplecov tomlrb travis + unf_ext (= 0.0.7.6)! webmock yard diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index fdf4f05f69..24b4712549 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -35,6 +35,7 @@ platforms: pid_one_command: /sbin/init intermediate_instructions: - RUN yum -y install sudo + - RUN yum -y install gcc-c++ - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: amazonlinux-2 @@ -43,6 +44,7 @@ platforms: pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - RUN yum -y install sudo + - RUN yum -y install gcc-c++ - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers @@ -68,6 +70,7 @@ platforms: pid_one_command: /sbin/init intermediate_instructions: - RUN yum -y install sudo + - RUN yum -y install gcc-c++ - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: centos-7 @@ -76,6 +79,7 @@ platforms: pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - RUN yum -y install sudo + - RUN yum -y install gcc-c++ - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: fedora-latest @@ -84,6 +88,7 @@ platforms: pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - RUN dnf -y install sudo + - RUN yum -y install gcc-c++ - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: ubuntu-14.04 @@ -116,6 +121,8 @@ platforms: pid_one_command: /bin/systemd intermediate_instructions: - RUN /usr/bin/zypper install -y sudo + - RUN /usr/bin/zypper install -y gcc-c++ + suites: - name: base |