Skip to content

Commit

Permalink
Merge pull request #854 from zdennis/fix-ci-mysql
Browse files Browse the repository at this point in the history
Fix issue starting mysql service
  • Loading branch information
jkowens authored Oct 4, 2024
2 parents 01cb6b9 + 1b81d98 commit d713bd2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
ports:
- 3306:3306
env:
MYSQL_HOST: 127.0.0.1
MYSQL_ROOT_PASSWORD: root
MYSQL_USER: github
MYSQL_PASSWORD: github
Expand Down Expand Up @@ -103,8 +104,6 @@ jobs:
rubygems: latest
- name: Set up databases
run: |
sudo /etc/init.d/mysql start
mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }} CHARACTER SET utf8 COLLATE utf8_general_ci;' -u root -proot
psql -h localhost -U postgres -c 'create database ${{ env.DB_DATABASE }};'
psql -h localhost -U postgres -d ${{ env.DB_DATABASE }} -c 'create extension if not exists hstore;'
psql -h localhost -U postgres -c 'create extension if not exists postgis;'
Expand Down
4 changes: 2 additions & 2 deletions test/github/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ common: &common
password: root
encoding: utf8
collation: utf8_general_ci
host: localhost
host: 127.0.0.1
database: activerecord_import_test

jdbcpostgresql: &postgresql
Expand Down Expand Up @@ -54,7 +54,7 @@ seamless_database_pool:
pool_adapter: mysql2
prepared_statements: false
master:
host: localhost
host: 127.0.0.1

sqlite:
adapter: sqlite
Expand Down

0 comments on commit d713bd2

Please sign in to comment.