Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

circle ci config update

Damian Legawiec7b903faa5403
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32d2645618..fc78677cc7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,24 +102,6 @@ jobs:
- image: cimg/mysql:8.0
command: [--default-authentication-plugin=mysql_native_password]
- send_test_coverage:
- <<: *defaults
- steps:
- - checkout
- - attach_workspace:
- at: /tmp/workspace
- - run:
- name: Merge coverage reports
- command:
- bundle check || bundle install &&
- bundle exec rake coverage:report
- - run:
- name: Allow executing given file
- command: chmod +x << parameters.run_file_path >>
- - run:
- name: Send test coverage
- command: bash << parameters.run_file_path >>
-
workflows:
main:
@@ -127,14 +109,6 @@ workflows:
- run_test:
name: bundle_ruby
run_file_path: ./bin/bundle_ruby.sh
- - run_test:
- name: brakeman
- restore_cache_key_1: spree-brakeman-{{ .Branch }}
- restore_cache_key_2: spree-brakeman
- save_cache_key: spree-brakeman-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
- run_file_path: ./bin/brakeman.sh
- requires:
- - bundle_ruby
- tests_postgres:
name: tests_rails_postgres
store_artefacts: true
@@ -148,6 +122,7 @@ workflows:
run_file_path: ./bin/tests_database_ci.sh
requires:
- bundle_ruby
+ - tests_rails_postgres
- tests_postgres:
name: tests_rails_7_0_postgres
rails_version: '~> 7.0.0'
@@ -155,6 +130,7 @@ workflows:
run_file_path: ./bin/tests_database_ci.sh
requires:
- bundle_ruby
+ - tests_rails_postgres
- tests_postgres:
name: tests_rails_6_1_postgres
rails_version: '~> 6.1.0'
@@ -162,20 +138,21 @@ workflows:
run_file_path: ./bin/tests_database_ci.sh
requires:
- bundle_ruby
+ - tests_rails_postgres
- tests_mysql:
name: tests_rails_mysql
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
- post-steps:
- - persist_to_workspace:
- root: /tmp/workspace
- paths:
- - simplecov
requires:
- bundle_ruby
- - send_test_coverage:
- name: send_test_coverage
- run_file_path: ./bin/tests_coverage.sh
+ - tests_rails_postgres
+ - run_test:
+ name: brakeman
+ restore_cache_key_1: spree-brakeman-{{ .Branch }}
+ restore_cache_key_2: spree-brakeman
+ save_cache_key: spree-brakeman-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+ run_file_path: ./bin/brakeman.sh
requires:
- - tests_rails_mysql
+ - bundle_ruby
+ - tests_rails_postgres
diff --git a/bin/tests_coverage.sh b/bin/tests_coverage.sh
deleted file mode 100644
index af15dca588..0000000000
--- a/bin/tests_coverage.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -euxo pipefail
-
-
-mkdir -p tmp/
-curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
-chmod +x ./tmp/cc-test-reporter
-
-export GIT_BRANCH="$CIRCLE_BRANCH"
-export GIT_COMMIT_SHA="$CIRCLE_SHA1"
-export GIT_COMMITTED_AT="$(date +%s)"
-
-
-./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.api.json /tmp/workspace/simplecov/api/.resultset.json
-./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.core.json /tmp/workspace/simplecov/core/.resultset.json
-./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.emails.json /tmp/workspace/simplecov/emails/.resultset.json
-
-./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json -p 3 -o tmp/codeclimate.total.json
-./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.total.json
\ No newline at end of file