Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Only bundle install for ecosystem under test #3426

Merged
merged 2 commits into from
Apr 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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"
19 changes: 0 additions & 19 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
5 changes: 5 additions & 0 deletions bundler/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions cargo/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions common/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions composer/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions dep/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions docker/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions elm/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions git_submodules/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions github_actions/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions go_modules/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions gradle/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions hex/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions maven/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions npm_and_yarn/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions nuget/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions omnibus/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions python/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec
5 changes: 5 additions & 0 deletions terraform/script/ci-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

bundle install
bundle exec rubocop .
bundle exec rspec spec