Merge pull request #3430 from dependabot/jurre/clean-up-ci-workflow

CI: Simplify workflow by moving suite specific tests into test script
dependabot · Apr 1, 2021 · 5ec0348 · 5ec0348
2 parents 1610f91 + 7c84fdb
commit 5ec0348
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,25 +91,6 @@ jobs:
         run: |
           docker push "$CORE_CI_IMAGE:latest"
           docker push "$CORE_CI_IMAGE:ci--$BRANCH_REF"
-      - name: Run Python flake8 linting
-        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 js linting and tests
-        if: matrix.suite.name == 'npm_and_yarn'
-        run: |
-          docker run --rm "$CORE_CI_IMAGE" bash -c "cd /opt/npm_and_yarn && npm run lint"
-          docker run --rm "$CORE_CI_IMAGE" bash -c "cd /opt/npm_and_yarn && npm test"
-      - name: Run bundler v1 native helper specs
-        if: matrix.suite.name == 'bundler1'
-        run: |
-          docker run --rm "$CORE_CI_IMAGE" bash -c \
-            "cd /home/dependabot/dependabot-core/bundler/helpers/v1 && BUNDLER_VERSION=1 bundle install && BUNDLER_VERSION=1 bundle exec rspec spec"
-      - name: Run bundler v2 native helper specs
-        if: matrix.suite.name == 'bundler2'
-        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
         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 \

diff --git a/bundler/script/ci-test b/bundler/script/ci-test
@@ -3,3 +3,17 @@
 bundle install
 bundle exec rubocop .
 bundle exec rspec spec
+
+if [ "$SUITE_NAME" == "bundler1" ]; then
+  cd helpers/v1 && \
+  BUNDLER_VERSION=1 bundle install && \
+  BUNDLER_VERSION=1 bundle exec rspec spec &&\
+  cd -
+fi
+
+if [ "$SUITE_NAME" == "bundler2" ]; then
+  cd helpers/v2 && \
+  BUNDLER_VERSION=2 bundle install && \
+  BUNDLER_VERSION=2 bundle exec rspec spec &&\
+  cd -
+fi
diff --git a/npm_and_yarn/script/ci-test b/npm_and_yarn/script/ci-test
@@ -3,3 +3,6 @@
 bundle install
 bundle exec rubocop .
 bundle exec rspec spec
+
+cd /opt/npm_and_yarn && npm run lint && cd -
+cd /opt/npm_and_yarn && npm test && cd -
diff --git a/python/script/ci-test b/python/script/ci-test
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 bundle install
+pyenv exec flake8 helpers/. --count --exclude=./.*,./python/spec/fixtures --show-source --statistics
 bundle exec rubocop .
 bundle exec rspec spec