From c1e81494122026178d9cb1f314d586b83fc9b0aa Mon Sep 17 00:00:00 2001 From: Naoki Takaesu Date: Mon, 30 Jan 2023 11:05:44 +0900 Subject: [PATCH] Revert "refactor: merge test and rspec" This reverts commit 6f5965d2c408de64784a03e6dbc3e45d0de5c9d0. --- .circleci/config.yml | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 87584937..85758606 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,9 +57,34 @@ jobs: - redmine-plugin/install-self - redmine-plugin/generate-database_yml - redmine-plugin/bundle-install - - redmine-plugin/rspec - redmine-plugin/migrate-without-plugins - plugin-test/run-tests + rspec: + parameters: + redmine_version: + type: string + ruby_version: + type: string + default: '2.7' + db: + type: enum + enum: ['mysql', 'pg'] + default: pg + db_version: + type: string + default: 'latest-ram' + executor: + name: redmine-plugin/ruby-<< parameters.db >> + ruby_version: << parameters.ruby_version >> + db_version: << parameters.db_version >> + steps: + - checkout + - redmine-plugin/download-redmine: + version: << parameters.redmine_version >> + - redmine-plugin/install-self + - redmine-plugin/generate-database_yml + - redmine-plugin/bundle-install + - redmine-plugin/rspec workflows: run-tests-workflow: jobs: @@ -73,3 +98,14 @@ workflows: database: mysql ruby_version: '2.6' redmine_version: '4.2.9' + - rspec: + name: RSpec on newest versions with PostgreSQL + redmine_version: latest + ruby_version: '2.7' + db: pg + - rspec: + name: RSpec on oldest versions with MySQL + redmine_version: '4.0.9' + ruby_version: '2.6' + db: mysql + db_version: '5.7-ram'