From 5289188d233541aff08664f248600f2f89c3e9c2 Mon Sep 17 00:00:00 2001 From: Connor Ferguson <68167430+cpfergus1@users.noreply.github.com> Date: Thu, 11 May 2023 19:24:07 -0600 Subject: [PATCH] Use Main In Place of Master Master has been deprecated in favor of main https://github.com/solidusio/solidus/pull/5042 --- .circleci/config.yml | 4 ++-- Gemfile | 4 ++-- bin/sandbox | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12bb10e..9fd21ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,14 +22,14 @@ workflows: jobs: - run-specs-with-postgres - run-specs-with-mysql - "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-postgres - run-specs-with-mysql diff --git a/Gemfile b/Gemfile index 661491e..81abf77 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -branch = ENV.fetch('SOLIDUS_BRANCH', 'master') -solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2') +branch = ENV.fetch('SOLIDUS_BRANCH', 'main') +solidus_git, solidus_frontend_git = if (branch == 'main') || (branch >= 'v3.2') %w[solidusio/solidus solidusio/solidus_frontend] else %w[solidusio/solidus] * 2 diff --git a/bin/sandbox b/bin/sandbox index bc3efe2..437815d 100755 --- a/bin/sandbox +++ b/bin/sandbox @@ -22,7 +22,7 @@ if [ ! -z $SOLIDUS_BRANCH ] then BRANCH=$SOLIDUS_BRANCH else - BRANCH="master" + BRANCH="main" fi extension_name="solidus_jwt"