Skip to content

Commit

Permalink
Merge pull request #209 from true-runes/development
Browse files Browse the repository at this point in the history
v4.3.0
  • Loading branch information
nikukyugamer authored Feb 12, 2023
2 parents ea29e9b + e516dee commit d9a4639
Show file tree
Hide file tree
Showing 18 changed files with 338 additions and 138 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ executors:
parameters:
ruby_version_tag:
type: string
default: '3.0.1'
default: '3.0.2'
pg_version_tag:
type: string
default: '13.2'
Expand All @@ -26,7 +26,7 @@ jobs:
build:
executor:
name: rails_executor
ruby_version_tag: '3.0.1'
ruby_version_tag: '3.0.2'
pg_version_tag: '13.2'
environment:
TZ: "Asia/Tokyo"
Expand Down
8 changes: 0 additions & 8 deletions .github/dependabot.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: GitHub Actions CI
runs-on: ubuntu-latest
container:
image: ruby:3.0.1
image: ruby:3.0.2
env:
BUNDLE_PATH: vendor/bundle
RAILS_ENV: test
Expand All @@ -14,7 +14,7 @@ jobs:
RAILS_DATABASE_PASSWORD: postgres
services:
postgres:
image: postgres:13.2
image: postgres:15.1
ports:
- 5432:5432
env:
Expand All @@ -29,7 +29,7 @@ jobs:
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# - name: 基本パッケージのインストールを行う
# run: |
# apt-get update
Expand All @@ -44,7 +44,7 @@ jobs:
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Yarn のキャッシュファイルを取得する
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -56,7 +56,7 @@ jobs:
# run: |
# gem install bundler --no-document -v 1.17.3 || true
- name: RubyGems のキャッシュを復元する
uses: actions/cache@v1
uses: actions/cache@v3
id: rubygems-cache
with:
path: vendor/bundle
Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ AllCops:
- 'bin/**/*'
- 'lib/price-simulator/**/*'
- 'tmp/**/*'
NewCops: enable

Style/TrailingCommaInArrayLiteral:
EnforcedStyleForMultiline: comma
Expand Down
4 changes: 2 additions & 2 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,5 @@ Naming/AccessorMethodName:
Rails/HelperInstanceVariable:
Enabled: false

AsciiComments:
Enabled: false
# AsciiComments:
# Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.2
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.0.1'
ruby '3.0.2'

gem 'rails'

Expand Down
Loading

0 comments on commit d9a4639

Please sign in to comment.