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.

Sign up for GitHub

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

Jump to bottom

Remove unnecessary build configurations #11844

Merged
merged 1 commit into from
Feb 6, 2023
Merged

Remove unnecessary build configurations #11844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
160 changes: 8 additions & 152 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ defaults: &defaults
- image: &ruby_2_7_image circleci/ruby:2.7-node-browsers
- image: &redis_image circleci/redis:6.2-alpine

defaults_3_0: &defaults_3_0
<<: *defaults
docker:
- image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
- image: &redis_image circleci/redis:6.2-alpine

defaults_3_1: &defaults_3_1
<<: *defaults
docker:
- image: &ruby_3_1_image cimg/ruby:3.1.3-browsers
- image: *redis_image

defaults_3_2: &defaults_3_2
<<: *defaults
docker:
Expand Down Expand Up @@ -63,67 +51,6 @@ run_tests_2_7: &run_tests_2_7
- store_test_results:
path: /tmp/test-results

run_tests_3_0: &run_tests_3_0
<<: *defaults_3_0
parallelism: 3
steps:
- checkout
- restore_cache:
keys:
- spree-bundle-v10-ruby-3-0-{{ .Branch }}
- spree-bundle-v10-ruby-3-0
- run:
name: Add keyserver
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
- run:
name: Install libvips
command: sudo apt-get update && sudo apt-get install libvips
- run:
name: Ensure Bundle Install
command: |
bundle install
./bin/build-ci.rb install
- run:
name: Run rspec in parallel
command: ./bin/build-ci.rb test
- store_artifacts:
path: /tmp/test-artifacts
destination: test-artifacts
- store_artifacts:
path: /tmp/test-results
destination: raw-test-output
- store_test_results:
path: /tmp/test-results

run_tests_3_1: &run_tests_3_1
<<: *defaults_3_1
parallelism: 3
steps:
- checkout
- restore_cache:
keys:
- spree-bundle-v10-ruby-3-1-{{ .Branch }}
- spree-bundle-v10-ruby-3-1
- run:
name: Install libvips
command: sudo apt-get update && sudo apt-get install libvips42
- run:
name: Ensure Bundle Install
command: |
bundle install
./bin/build-ci.rb install
- run:
name: Run rspec in parallel
command: ./bin/build-ci.rb test
- store_artifacts:
path: /tmp/test-artifacts
destination: test-artifacts
- store_artifacts:
path: /tmp/test-results
destination: raw-test-output
- store_test_results:
path: /tmp/test-results

run_tests_3_2: &run_tests_3_2
<<: *defaults_3_2
parallelism: 3
Expand Down Expand Up @@ -178,51 +105,6 @@ jobs:
paths:
- ~/spree/vendor/bundle

bundle_ruby_3_0:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- spree-bundle-v10-ruby-3-0-{{ .Branch }}
- spree-bundle-v10-ruby-3-0
- run:
name: Add keyserver
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
- run:
name: Install libvips
command: sudo apt-get update && sudo apt-get install libvips
- run:
name: Bundle Install
command: |
bundle check || bundle install
./bin/build-ci.rb install
- save_cache:
key: spree-bundle-v10-ruby-3-0-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
paths:
- ~/spree/vendor/bundle

bundle_ruby_3_1:
<<: *defaults_3_1
steps:
- checkout
- restore_cache:
keys:
- spree-bundle-v10-ruby-3-1-{{ .Branch }}
- spree-bundle-v10-ruby-3-1
- run:
name: Install libvips
command: sudo apt-get update && sudo apt-get install libvips42
- run:
name: Bundle Install
command: |
bundle check || bundle install
./bin/build-ci.rb install
- save_cache:
key: spree-bundle-v10-ruby-3-1-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
paths:
- ~/spree/vendor/bundle

bundle_ruby_3_2:
<<: *defaults_3_2
steps:
Expand Down Expand Up @@ -284,24 +166,6 @@ jobs:
environment:
POSTGRES_USER: postgres

tests_ruby_3_0_rails_7_0_postgres:
<<: *run_tests_3_0
environment:
<<: *postgres_environment
docker:
- image: *ruby_3_0_image
- image: *postgres_image
- image: *redis_image

tests_ruby_3_1_rails_7_0_postgres:
<<: *run_tests_3_1
environment:
<<: *postgres_environment
docker:
- image: *ruby_3_1_image
- image: *postgres_image
- image: *redis_image

tests_ruby_3_2_rails_7_0_postgres:
<<: *run_tests_3_2
environment:
Expand All @@ -317,8 +181,8 @@ jobs:
<<: *postgres_environment
RAILS_VERSION: '~> 6.1.0'

tests_ruby_3_0_rails_7_0_mysql:
<<: *run_tests_3_0
tests_ruby_3_2_rails_7_0_mysql:
<<: *run_tests_3_2
environment:
<<: *environment
DB: mysql
Expand All @@ -327,16 +191,16 @@ jobs:
COVERAGE: true
COVERAGE_DIR: /tmp/workspace/simplecov
docker:
- image: *ruby_3_0_image
- image: *ruby_3_2_image
- image: *redis_image
- image: circleci/mysql:8-ram
command: [--default-authentication-plugin=mysql_native_password]
steps:
- checkout
- restore_cache:
keys:
- spree-bundle-v10-ruby-3-0-{{ .Branch }}
- spree-bundle-v10-ruby-3-0
- spree-bundle-v10-ruby-3-2-{{ .Branch }}
- spree-bundle-v10-ruby-3-2
- run:
name: Add keyserver
command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
Expand Down Expand Up @@ -399,30 +263,22 @@ workflows:
main:
jobs:
- bundle_ruby_2_7
- bundle_ruby_3_0
- bundle_ruby_3_1
- bundle_ruby_3_2
- brakeman:
requires:
- bundle_ruby_3_2
- tests_ruby_3_2_rails_7_0_postgres:
requires:
- bundle_ruby_3_2
- tests_ruby_3_1_rails_7_0_postgres:
requires:
- bundle_ruby_3_1
- tests_ruby_3_0_rails_7_0_postgres:
requires:
- bundle_ruby_3_0
- tests_ruby_2_7_rails_7_0_postgres:
requires:
- bundle_ruby_2_7
- tests_ruby_2_7_rails_6_1_postgres:
requires:
- bundle_ruby_2_7
- tests_ruby_3_0_rails_7_0_mysql:
- tests_ruby_3_2_rails_7_0_mysql:
requires:
- bundle_ruby_3_0
- bundle_ruby_3_2
- send_test_coverage:
requires:
- tests_ruby_3_0_rails_7_0_mysql
- tests_ruby_3_2_rails_7_0_mysql