diff --git a/.circleci/config.yml b/.circleci/config.yml index 1364d92..cfaa1d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: parameters: solidus: type: string - default: master + default: main db: type: string default: "postgres" @@ -32,7 +32,7 @@ workflows: - run-specs: name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>" matrix: - parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] } + parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] } - run-specs: name: *name matrix: @@ -42,19 +42,19 @@ workflows: matrix: parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] } - "Weekly run specs against master": + "Weekly run specs against main": triggers: - schedule: cron: "0 0 * * 4" # every Thursday filters: branches: only: - - master + - main jobs: - run-specs: name: *name matrix: - parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] } + parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] } - run-specs: name: *name matrix: diff --git a/Gemfile b/Gemfile index a9ad72d..50019bd 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -branch = ENV.fetch('SOLIDUS_BRANCH', 'master') +branch = ENV.fetch('SOLIDUS_BRANCH', 'main') gem 'solidus_core', github: 'solidusio/solidus', branch: branch case ENV['DB']