.circleci/config.yml in noid-rails-3.0.3 vs .circleci/config.yml in noid-rails-3.1.0

- old
+ new

@@ -1,16 +1,16 @@ version: 2.1 orbs: - samvera: samvera/circleci-orb@0 + samvera: samvera/circleci-orb@1.0 jobs: bundle_and_test: parameters: ruby_version: type: string bundler_version: type: string - default: 1.17.3 + default: 2.4.3 rails_version: type: string executor: name: 'samvera/ruby' ruby_version: << parameters.ruby_version >> @@ -19,10 +19,23 @@ ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-coffee --skip-puma --skip-test RAILS_VERSION: << parameters.rails_version >> steps: - samvera/cached_checkout + - run: + name: Check for a branch named 'master' + command: | + git fetch --all --quiet --prune --prune-tags + if [[ -n "$(git branch --all --list master */master)" ]]; then + echo "A branch named 'master' was found. Please remove it." + echo "$(git branch --all --list master */master)" + fi + [[ -z "$(git branch --all --list master */master)" ]] + + - run: 'sudo apt-get update' + - run: 'sudo apt-get install -y libsqlite3-dev' + - samvera/bundle_for_gem: ruby_version: << parameters.ruby_version >> bundler_version: << parameters.bundler_version >> project: noid-rails @@ -40,55 +53,40 @@ workflows: ci: jobs: - bundle_and_test: - name: ruby2-7_rails6-1 - ruby_version: 2.7.1 - rails_version: 6.1.3.2 + name: ruby3-2_rails7-0 + ruby_version: 3.2.0 + rails_version: 7.0.4 + - bundle_and_test: - name: ruby2-7_rails6-0 - ruby_version: 2.7.1 - rails_version: 6.0.3.1 - - bundle_and_test: - name: ruby2-7_rails5-2 - ruby_version: 2.7.1 - rails_version: 5.2.4.3 + name: ruby3-1_rails7-0 + ruby_version: 3.1.3 + rails_version: 7.0.4 - bundle_and_test: - name: ruby2-6_rails6-1 - ruby_version: 2.6.6 - rails_version: 6.1.3.2 + name: ruby3-0_rails7-0 + ruby_version: 3.0.5 + rails_version: 7.0.4 - bundle_and_test: - name: ruby2-6_rails6-0 - ruby_version: 2.6.6 - rails_version: 6.0.3.1 + name: ruby3-0_rails6-1 + ruby_version: 3.0.5 + rails_version: 6.1.7 - bundle_and_test: - name: ruby2-6_rails5-2 - ruby_version: 2.6.6 - rails_version: 5.2.4.3 + name: ruby3-0_rails6-0 + ruby_version: 3.0.5 + rails_version: 6.0.6 - bundle_and_test: - name: ruby2-5_rails6-1 - ruby_version: 2.5.8 - rails_version: 6.1.3.2 + name: ruby2-7_rails6-1 + ruby_version: 2.7.7 + rails_version: 6.1.7 - bundle_and_test: - name: ruby2-5_rails6-0 - ruby_version: 2.5.8 - rails_version: 6.0.3.1 + name: ruby2-7_rails6-0 + ruby_version: 2.7.7 + rails_version: 6.0.6 - bundle_and_test: - name: ruby2-5_rails5-2 - ruby_version: 2.5.8 - rails_version: 5.2.4.3 - - bundle_and_test: - name: ruby2-5_rails5-1 - ruby_version: 2.5.8 - rails_version: 5.1.7 + name: ruby2-7_rails5-2 + ruby_version: 2.7.7 + rails_version: 5.2.8.1 - - bundle_and_test: - name: ruby2-4_rails5-2 - ruby_version: 2.4.10 - rails_version: 5.2.4.3 - - bundle_and_test: - name: ruby2-4_rails5-1 - ruby_version: 2.4.10 - rails_version: 5.1.7