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

Commit c9cb8c9

Browse files
authored
feat: 🎸 Ruby のバージョンを v2.7.6 に上げた (#132)
* feat: 🎸 Ruby のバージョンを v2.7.6 に上げた * ci: 🎡 CI における Ruby のバージョンもアップデートした * ci: 🎡 OS が変わったことによる MySQL のアクセス方法の変更に対応 * ci: 🎡 MySQL に root ではログインできないのでアカウント情報を修正した
1 parent c837af5 commit c9cb8c9

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

.circleci/config.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
version: 2
2+
23
jobs:
34
build:
45
docker:
5-
- image: circleci/ruby:2.6.6-node-browsers-legacy
6+
- image: cimg/ruby:2.7.6-browsers
67
environment:
78
- RAILS_ENV: test
89
- SELENIUM_CHROME_HEADLESS: true
@@ -11,23 +12,24 @@ jobs:
1112
- MYSQL_USERNAME: root
1213
- MYSQL_PASSWORD: root
1314
- MYSQL_DATABASE: suikoden_election_2017_test
14-
- image: circleci/mysql:5.7.22
15+
- image: cimg/mysql:5.7.38
1516
environment:
16-
MYSQL_USER: root
17-
MYSQL_ROOT_PASSWORD: root
17+
MYSQL_USER: gss2017
18+
MYSQL_PASSWORD: gss2017_pasword
19+
MYSQL_ROOT_PASSWORD: root_password
1820
MYSQL_PORT: 3306
1921
MYSQL_DATABASE: suikoden_election_2017_test
2022
working_directory: ~/repo
2123
steps:
2224
- checkout
2325
- restore_cache:
2426
keys:
25-
# - v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}
2627
- v1-dependencies-{{ checksum "Gemfile.lock" }}
2728
- v1-dependencies-
2829
- run:
2930
name: Install system dependencies
3031
command: |
32+
sudo apt update
3133
sudo apt install -y fonts-migmix
3234
- run:
3335
name: Install Chrome
@@ -51,14 +53,11 @@ jobs:
5153
bundle install --jobs=4 --retry=3 --path vendor/bundle
5254
- run:
5355
name: Execute yarn install
54-
# TODO: 調整の必要あり
5556
command: yarn install
5657
- save_cache:
57-
# key: v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}
5858
key: v1-dependencies-{{ checksum "Gemfile.lock" }}
5959
paths:
6060
- vendor/bundle
61-
# - node_modules
6261
- run:
6362
name: Wait for booting DBMS
6463
command: dockerize -wait tcp://127.0.0.1:3306 -timeout 10s

.github/workflows/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
ruby-version: ['2.6.6', '2.7.6', '3.1.2']
17+
ruby-version: ['2.7.6', '3.0.4', '3.1.2']
1818
steps:
1919
- name: コードをチェックアウトする
2020
uses: actions/checkout@v3

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.6
1+
2.7.6

config/database.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ test:
2929
<<: *default
3030
host: <%= ENV['MYSQL_HOST_TEST'] || '127.0.0.1' %>
3131
port: <%= ENV['MYSQL_PORT_TEST'] || 3306 %>
32-
username: <%= ENV['MYSQL_USERNAME_TEST'] || 'root' %>
33-
password: <%= ENV['MYSQL_PASSWORD_TEST'] || 'root' %>
32+
username: <%= ENV['MYSQL_USERNAME_TEST'] || 'gss2017' %>
33+
password: <%= ENV['MYSQL_PASSWORD_TEST'] || 'gss2017_pasword' %>
3434
database: <%= ENV['MYSQL_DATABASE_TEST'] || 'suikoden_election_2017_test' %>

0 commit comments

Comments
 (0)