From ba8a2f3ee0370a18704c35da6ae3ad40f06cf586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Busqu=C3=A9?= Date: Mon, 24 Apr 2023 16:06:55 +0200 Subject: [PATCH 1/3] Adapt new Solidus default branch Ref. https://github.com/solidusio/solidus/pull/5042 [skip ci] --- .circleci/config.yml | 12 ++++++------ Gemfile | 2 +- README.md | 2 +- .../templates/extension/.circleci/config.yml | 4 ++-- .../templates/extension/Gemfile.tt | 4 ++-- .../templates/extension/bin/sandbox.tt | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0722b521..df2b9dc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,11 +20,11 @@ commands: bundle --version jobs: - solidus-master: + solidus-main: executor: name: solidusio_extensions/sqlite ruby_version: '3.1' - steps: ['setup', 'solidusio_extensions/run-tests-solidus-master'] + steps: ['setup', 'solidusio_extensions/run-tests-solidus-main'] solidus-current: executor: name: solidusio_extensions/sqlite @@ -44,20 +44,20 @@ jobs: workflows: "Run specs on supported Solidus versions": jobs: - - solidus-master + - solidus-main - solidus-current - solidus-older - lint-code - "Weekly run specs against master": + "Weekly run specs against main": triggers: - schedule: cron: "0 0 * * 4" # every Thursday filters: branches: only: - - master + - main jobs: - - solidus-master + - solidus-main - solidus-current - solidus-older diff --git a/Gemfile b/Gemfile index ac84833a..12b11bb2 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } # Specify your gem's dependencies in solidus_dev_support.gemspec gemspec -branch = ENV.fetch('SOLIDUS_BRANCH', 'master') +branch = ENV.fetch('SOLIDUS_BRANCH', 'main') gem 'solidus', github: 'solidusio/solidus', branch: branch # A workaround for https://github.com/bundler/bundler/issues/6677 diff --git a/README.md b/README.md index 940395cb..675e185e 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ the `DB` and `SOLIDUS_BRANCH` env variables. DB=[postgres|mysql|sqlite] SOLIDUS_BRANCH= bin/sandbox ``` -By default we use sqlite3 and the master branch. +By default we use sqlite3 and the main branch. ### Rails generators diff --git a/lib/solidus_dev_support/templates/extension/.circleci/config.yml b/lib/solidus_dev_support/templates/extension/.circleci/config.yml index 28d70ebd..4370b73c 100644 --- a/lib/solidus_dev_support/templates/extension/.circleci/config.yml +++ b/lib/solidus_dev_support/templates/extension/.circleci/config.yml @@ -39,14 +39,14 @@ workflows: - run-specs-with-mysql - lint-code - "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-with-sqlite - run-specs-with-postgres diff --git a/lib/solidus_dev_support/templates/extension/Gemfile.tt b/lib/solidus_dev_support/templates/extension/Gemfile.tt index 5b25fe24..3c2c1754 100644 --- a/lib/solidus_dev_support/templates/extension/Gemfile.tt +++ b/lib/solidus_dev_support/templates/extension/Gemfile.tt @@ -3,11 +3,11 @@ 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', github: 'solidusio/solidus', branch: branch # The solidus_frontend gem has been pulled out since v3.2 -gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master' +gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'main' gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem # Needed to help Bundler figure out how to resolve dependencies, diff --git a/lib/solidus_dev_support/templates/extension/bin/sandbox.tt b/lib/solidus_dev_support/templates/extension/bin/sandbox.tt index 00f421d6..10530b3c 100755 --- a/lib/solidus_dev_support/templates/extension/bin/sandbox.tt +++ b/lib/solidus_dev_support/templates/extension/bin/sandbox.tt @@ -7,8 +7,8 @@ test "$DB" = "sqlite" && export DB="sqlite3" if [ -z "$SOLIDUS_BRANCH" ] then - echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch" - SOLIDUS_BRANCH="master" + echo "~~> Use 'export SOLIDUS_BRANCH=[main|v3.2|...]' to control the Solidus branch" + SOLIDUS_BRANCH="main" fi echo "~~> Using branch $SOLIDUS_BRANCH of solidus" From 02db43863ed12465a9f1d74717cf590e1ac855ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Busqu=C3=A9?= Date: Mon, 22 May 2023 16:27:06 +0200 Subject: [PATCH 2/3] Stop trying to resolve solidus_frontend v4 on the test extension [skip ci] --- lib/solidus_dev_support/templates/extension/Gemfile.tt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/solidus_dev_support/templates/extension/Gemfile.tt b/lib/solidus_dev_support/templates/extension/Gemfile.tt index 3c2c1754..b0194708 100644 --- a/lib/solidus_dev_support/templates/extension/Gemfile.tt +++ b/lib/solidus_dev_support/templates/extension/Gemfile.tt @@ -7,8 +7,13 @@ branch = ENV.fetch('SOLIDUS_BRANCH', 'main') gem 'solidus', github: 'solidusio/solidus', branch: branch # The solidus_frontend gem has been pulled out since v3.2 -gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'main' -gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem +if branch >= 'v3.2' + gem 'solidus_frontend' +elsif branch == 'main' + gem 'solidus_frontend', github: 'solidusio/solidus_frontend' +else + gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch +end # Needed to help Bundler figure out how to resolve dependencies, # otherwise it takes forever to resolve them. From 14a0ba8d37abb9d2d8b5f5a397d813463cd7f682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Busqu=C3=A9?= Date: Mon, 22 May 2023 16:44:00 +0200 Subject: [PATCH 3/3] Allow Solidus 4 on the test extension --- .../templates/extension/extension.gemspec.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/solidus_dev_support/templates/extension/extension.gemspec.tt b/lib/solidus_dev_support/templates/extension/extension.gemspec.tt index 1f09acd6..a6493e79 100644 --- a/lib/solidus_dev_support/templates/extension/extension.gemspec.tt +++ b/lib/solidus_dev_support/templates/extension/extension.gemspec.tt @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4'] + spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5'] spec.add_dependency 'solidus_support', '~> 0.5' spec.add_development_dependency 'solidus_dev_support', '<%= SolidusDevSupport.gem_version.approximate_recommendation %>'