From 5a861daeaa279c590a2cb7fa248bf96006cc6792 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Sun, 17 Jan 2021 09:01:50 +0900 Subject: [PATCH] Rails default branch name changed from master to main --- .github/workflows/cronjob.yml | 6 +++--- Gemfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cronjob.yml b/.github/workflows/cronjob.yml index fdf35d5..24c7146 100644 --- a/.github/workflows/cronjob.yml +++ b/.github/workflows/cronjob.yml @@ -16,7 +16,7 @@ jobs: - 2.6.6 env: DB: sqlite3 - RAILS: master + RAILS: main steps: - uses: actions/checkout@v2 - name: Set up Ruby @@ -39,7 +39,7 @@ jobs: - 2.6.6 env: DB: mysql - RAILS: master + RAILS: main MYSQL_USERNAME: root MYSQL_PASSWORD: root steps: @@ -71,7 +71,7 @@ jobs: - 2.6.6 env: DB: postgres - RAILS: master + RAILS: main DATABASE_USERNAME: postgres DATABASE_PASSWORD: postgres DATABASE_HOST: 127.0.0.1 diff --git a/Gemfile b/Gemfile index eed7e41..bec0844 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ rails_version = case rails end gem 'faker', '~> 2.0' -gem 'sqlite3', ::Gem::Version.new(rails_version == 'master' ? '6.2.0.alpha' : rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3' +gem 'sqlite3', ::Gem::Version.new(rails_version == 'main' ? '6.2.0.alpha' : rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3' gem 'pg', '~> 1.0' gem 'pry', '~> 0.12.2' gem 'byebug'