diff options
author | Tim Smith <tsmith@chef.io> | 2019-05-01 10:52:26 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2019-05-01 10:52:26 -0700 |
commit | b21dd64dac4184fe268c85e52aa5f99bdfcdcf56 (patch) | |
tree | 2c4e36b1266521dca4ed1fe75c1535d8176fd31b | |
parent | 22b8476ee498816a952e67a1a732fa33125d3510 (diff) | |
download | chef-b21dd64dac4184fe268c85e52aa5f99bdfcdcf56.tar.gz |
Remove old maintainer gems from the Gemfilenuke_old_gems
These were used by our maintainer rake tasks. These are all gone now so there's no need for these gems.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | .expeditor/verify.pipeline.yml | 12 | ||||
-rw-r--r-- | .travis.yml | 14 | ||||
-rw-r--r-- | Gemfile | 8 | ||||
-rw-r--r-- | appveyor.yml | 2 |
4 files changed, 14 insertions, 22 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 437e10f937..b109acc4ba 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -9,7 +9,7 @@ steps: # - /workdir/scripts/bk_tests/bk_install.sh # - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6 # - cp /etc/hosts.noip6 /etc/hosts -# - cd /workdir; bundle install --without ci docgen guard integration maintenance omnibus_package --frozen +# - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen # - bundle exec rake spec:integration # expeditor: # executor: @@ -25,7 +25,7 @@ steps: # - /workdir/scripts/bk_tests/bk_install.sh # - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6 # - cp /etc/hosts.noip6 /etc/hosts -# - cd /workdir; bundle install --without ci docgen guard integration maintenance omnibus_package --frozen +# - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen # - bundle exec rake spec:functional # expeditor: # executor: @@ -38,7 +38,7 @@ steps: - label: "Unit Specs :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_install.sh - - bundle install --without ci docgen guard integration maintenance omnibus_package --frozen + - bundle install --without ci docgen guard integration omnibus_package --frozen - bundle exec rake spec:unit - bundle exec rake component_specs expeditor: @@ -138,7 +138,7 @@ steps: # - asdf local ruby 2.5.5 # - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6 # - cp /etc/hosts.noip6 /etc/hosts -# - bundle install --without ci docgen guard integration maintenance omnibus_package --frozen +# - bundle install --without ci docgen guard integration omnibus_package --frozen # - bundle exec rake spec:integration # expeditor: # executor: @@ -154,7 +154,7 @@ steps: # - /workdir/scripts/bk_tests/bk_install.sh # - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6 # - cp /etc/hosts.noip6 /etc/hosts -# - bundle install --without ci docgen guard integration maintenance omnibus_package --frozen +# - bundle install --without ci docgen guard integration omnibus_package --frozen # - bundle exec rake spec:functional # expeditor: # executor: @@ -168,7 +168,7 @@ steps: commands: - asdf local ruby 2.5.5 - /workdir/scripts/bk_tests/bk_install.sh - - bundle install --without ci docgen guard integration maintenance omnibus_package --frozen + - bundle install --without ci docgen guard integration omnibus_package --frozen - bundle exec rake spec:unit - bundle exec rake component_specs expeditor: diff --git a/.travis.yml b/.travis.yml index c7c5137a6e..a752cf9318 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,26 +38,26 @@ matrix: rvm: 2.5.5 sudo: true script: sudo -E $(which bundle) exec rake spec:integration; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen - env: INTEGRATION_SPECS_26: 1 rvm: 2.6.2 sudo: true script: sudo -E $(which bundle) exec rake spec:integration; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen - env: FUNCTIONAL_SPECS_25: 1 rvm: 2.5.5 sudo: true # the travis apt proxy screws with our functional testing something fierce script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen - env: FUNCTIONAL_SPECS_26: 1 rvm: 2.6.2 sudo: true script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen - env: UNIT_SPECS_25: 1 rvm: 2.5.5 @@ -65,7 +65,7 @@ matrix: script: - sudo -E $(which bundle) exec rake spec:unit; - sudo -E $(which bundle) exec rake component_specs - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen - env: UNIT_SPECS_26: 1 rvm: 2.6.2 @@ -73,13 +73,13 @@ matrix: script: - sudo -E $(which bundle) exec rake spec:unit; - sudo -E $(which bundle) exec rake component_specs - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen - env: CHEFSTYLE: 1 rvm: 2.6.2 script: bundle exec rake style # also remove integration / external tests - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + bundler_args: --without ci docgen guard integration omnibus_package --frozen # # External tests # @@ -42,14 +42,6 @@ group(:docgen) do gem "yard" end -group(:maintenance) do - gem "tomlrb" - - # To sync maintainers with github - gem "octokit" - gem "netrc" -end - # Everything except AIX group(:ruby_prof) do gem "ruby-prof" diff --git a/appveyor.yml b/appveyor.yml index 78a644134b..15ab998c80 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,7 +41,7 @@ install: - echo %PATH% - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem - set SSL_CERT_FILE=C:\cacert.pem - - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci + - SET BUNDLE_WITHOUT=server:docgen:pry:integration:ci - bundle config --local path vendor/bundle # use the cache we define above - bundle install || bundle install || bundle install - SET SPEC_OPTS=--format progress |