Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

feat: 🎸 Ruby のバージョンを v2.7.6 に上げた #132

Merged
merged 4 commits into from
Oct 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
version: 2

jobs:
build:
docker:
- image: circleci/ruby:2.6.6-node-browsers-legacy
- image: cimg/ruby:2.7.6-browsers
environment:
- RAILS_ENV: test
- SELENIUM_CHROME_HEADLESS: true
Expand All @@ -11,23 +12,24 @@ jobs:
- MYSQL_USERNAME: root
- MYSQL_PASSWORD: root
- MYSQL_DATABASE: suikoden_election_2017_test
- image: circleci/mysql:5.7.22
- image: cimg/mysql:5.7.38
environment:
MYSQL_USER: root
MYSQL_ROOT_PASSWORD: root
MYSQL_USER: gss2017
MYSQL_PASSWORD: gss2017_pasword
MYSQL_ROOT_PASSWORD: root_password
MYSQL_PORT: 3306
MYSQL_DATABASE: suikoden_election_2017_test
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
# - v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}
- v1-dependencies-{{ checksum "Gemfile.lock" }}
- v1-dependencies-
- run:
name: Install system dependencies
command: |
sudo apt update
sudo apt install -y fonts-migmix
- run:
name: Install Chrome
Expand All @@ -51,14 +53,11 @@ jobs:
bundle install --jobs=4 --retry=3 --path vendor/bundle
- run:
name: Execute yarn install
# TODO: 調整の必要あり
command: yarn install
- save_cache:
# key: v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}
key: v1-dependencies-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle
# - node_modules
- run:
name: Wait for booting DBMS
command: dockerize -wait tcp://127.0.0.1:3306 -timeout 10s
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['2.6.6', '2.7.6', '3.1.2']
ruby-version: ['2.7.6', '3.0.4', '3.1.2']
steps:
- name: コードをチェックアウトする
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.6
2.7.6
4 changes: 2 additions & 2 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ test:
<<: *default
host: <%= ENV['MYSQL_HOST_TEST'] || '127.0.0.1' %>
port: <%= ENV['MYSQL_PORT_TEST'] || 3306 %>
username: <%= ENV['MYSQL_USERNAME_TEST'] || 'root' %>
password: <%= ENV['MYSQL_PASSWORD_TEST'] || 'root' %>
username: <%= ENV['MYSQL_USERNAME_TEST'] || 'gss2017' %>
password: <%= ENV['MYSQL_PASSWORD_TEST'] || 'gss2017_pasword' %>
database: <%= ENV['MYSQL_DATABASE_TEST'] || 'suikoden_election_2017_test' %>