diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ccac3ced..d37b0a7e 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -59,7 +59,6 @@ jobs: env: BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile - PGPASSWORD: postgres TEST_CONFIG: ./spec/config.github.yml continue-on-error: ${{ matrix.experimental }} @@ -68,9 +67,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Database run: | - cat ./spec/config.github.yml - env | grep TEST_CONFIG - cat $TEST_CONFIG + psql -c "CREATE ROLE runner SUPERUSER LOGIN CREATEDB;" -U postgres -h localhost psql -c "CREATE DATABASE chronomodel;" -U postgres -h localhost psql -c "CREATE DATABASE chronomodel_railsapp;" -U postgres -h localhost - name: Set up Ruby @@ -79,22 +76,8 @@ jobs: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true - name: Run specs - run: bundle exec rake - - coverage: - needs: [ test ] - name: Coverage - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - uses: actions/setup-node@master - with: - node-version: '12' - - run: npm install -g yarn - - run: yarn install - - run: yarn build - - uses: paambaati/codeclimate-action@v2.2.4 + uses: paambaati/codeclimate-action@v2.7.5 env: CC_TEST_REPORTER_ID: dedfb7472ee410eec459bff3681d9a8fd8dd237e9bd7e8675a7c8eb7e253bba9 with: - coverageCommand: yarn coverage + coverageCommand: bundle exec rake diff --git a/spec/aruba/fixtures/database_with_default_username_and_password.yml b/spec/aruba/fixtures/database_with_default_username_and_password.yml index f3cc94b4..b1ffd6fb 100644 --- a/spec/aruba/fixtures/database_with_default_username_and_password.yml +++ b/spec/aruba/fixtures/database_with_default_username_and_password.yml @@ -5,6 +5,7 @@ default: &default encoding: unicode pool: 20 database: chronomodel_railsapp + host: <%= ENV['CI'] ? 'localhost' : '' %> development: <<: *default diff --git a/spec/aruba/fixtures/database_without_username_and_password.yml b/spec/aruba/fixtures/database_without_username_and_password.yml index 81d2ada3..a24b83c4 100644 --- a/spec/aruba/fixtures/database_without_username_and_password.yml +++ b/spec/aruba/fixtures/database_without_username_and_password.yml @@ -3,6 +3,7 @@ default: &default encoding: unicode pool: 20 database: chronomodel_railsapp + host: <%= ENV['CI'] ? 'localhost' : '' %> development: <<: *default