Merge pull request #3426 from dependabot/jurre/bundle-less

CI: Only bundle install for ecosystem under test
dependabot · Apr 1, 2021 · 8557ae2 · 8557ae2
2 parents fb8e3d4 + e05853d
commit 8557ae2
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -102,9 +102,6 @@ jobs:
         if: matrix.suite.name == 'python'
         run: |
           docker run --rm "$CORE_CI_IMAGE" bash -c "pyenv exec flake8 python/helpers/. --count --exclude=./.*,./python/spec/fixtures --show-source --statistics"
-      - name: Run Ruby Rubocop linting
-        run: |
-          docker run --rm "$CORE_CI_IMAGE" bash -c "cd /home/dependabot/dependabot-core/${{ matrix.suite.path }} && bundle exec rubocop ."
       - name: Run js linting and tests
         if: matrix.suite.name == 'npm_and_yarn'
         run: |
@@ -120,7 +117,7 @@ jobs:
         run: |
           docker run --rm "$CORE_CI_IMAGE" bash -c \
             "cd /home/dependabot/dependabot-core/bundler/helpers/v2 && BUNDLER_VERSION=2 bundle install && BUNDLER_VERSION=2 bundle exec rspec spec"
-      - name: Run ${{ matrix.suite.name }} tests with rspec
+      - name: Run ${{ matrix.suite.name }} tests
         run: |
           docker run --env "CI=true" --env "DEPENDABOT_TEST_ACCESS_TOKEN=$DEPENDABOT_TEST_ACCESS_TOKEN" --env "SUITE_NAME=${{ matrix.suite.name }}" --rm "$CORE_CI_IMAGE" bash -c \
-            "cd /home/dependabot/dependabot-core/${{ matrix.suite.path }} && bundle exec rspec spec"
+            "cd /home/dependabot/dependabot-core/${{ matrix.suite.path }} && ./script/ci-test"
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -48,25 +48,6 @@ COPY python/Gemfile python/dependabot-python.gemspec ${CODE_DIR}/python/
 COPY terraform/Gemfile terraform/dependabot-terraform.gemspec ${CODE_DIR}/terraform/
 COPY omnibus/Gemfile omnibus/dependabot-omnibus.gemspec ${CODE_DIR}/omnibus/
 
-RUN cd common && bundle install
-RUN cd bundler && bundle install
-RUN cd cargo && bundle install
-RUN cd composer && bundle install
-RUN cd dep && bundle install
-RUN cd docker && bundle install
-RUN cd elm && bundle install
-RUN cd git_submodules && bundle install
-RUN cd github_actions && bundle install
-RUN cd go_modules && bundle install
-RUN cd gradle && bundle install
-RUN cd hex && bundle install
-RUN cd maven && bundle install
-RUN cd npm_and_yarn && bundle install
-RUN cd nuget && bundle install
-RUN cd python && bundle install
-RUN cd terraform && bundle install
-RUN cd omnibus && bundle install
-
 COPY common/ ${CODE_DIR}/common/
 COPY bundler/ ${CODE_DIR}/bundler/
 COPY cargo/ ${CODE_DIR}/cargo/

diff --git a/bundler/script/ci-test b/bundler/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/cargo/script/ci-test b/cargo/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/common/script/ci-test b/common/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/composer/script/ci-test b/composer/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/dep/script/ci-test b/dep/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/docker/script/ci-test b/docker/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/elm/script/ci-test b/elm/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/git_submodules/script/ci-test b/git_submodules/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/github_actions/script/ci-test b/github_actions/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/go_modules/script/ci-test b/go_modules/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/gradle/script/ci-test b/gradle/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/hex/script/ci-test b/hex/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/maven/script/ci-test b/maven/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/npm_and_yarn/script/ci-test b/npm_and_yarn/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/nuget/script/ci-test b/nuget/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/omnibus/script/ci-test b/omnibus/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/python/script/ci-test b/python/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec
diff --git a/terraform/script/ci-test b/terraform/script/ci-test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+bundle install
+bundle exec rubocop .
+bundle exec rspec spec