Skip to content

Commit bcea4fe

Browse files
authored
fixing github workflow issues (#2417)
1 parent a54f85a commit bcea4fe

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.github/workflows/mysql.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
DB_ADAPTER: mysql2
1111
MYSQL_PWD: root
1212
RAILS_ENV: test
13-
WICKED_PDF_PATH: vendor/bundle/bin/wkhtmltopdf
1413

1514
steps:
1615
# Checkout the repo
@@ -79,6 +78,10 @@ jobs:
7978
run: |
8079
yarn install
8180
81+
# Figure out where wkhtmltopdf is installed
82+
- name: 'Determine wkhtmltopdf location'
83+
run: echo ::set-env name=WICKED_PDF_PATH::$(echo `bundle exec which wkhtmltopdf`)
84+
8285
# Setup the database
8386
- name: 'Setup Test DB'
8487
run: bundle exec rake db:setup RAILS_ENV=test

.github/workflows/postgres.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ jobs:
99
services:
1010
# Postgres installation
1111
db:
12-
image: postgres:11
12+
image: postgres
13+
env:
14+
# Latest version of Postgres has increased security. We can use the default
15+
# user/password in this testing scenario though so use the following env
16+
# variable to bypass this changes:
17+
# https://github.com/docker-library/postgres/issues/681
18+
POSTGRES_HOST_AUTH_METHOD: trust
1319
ports: ['5432:5432']
1420
options: >-
1521
--health-cmd pg_isready
@@ -84,6 +90,10 @@ jobs:
8490
${{ runner.os }}-yarn-
8591
${{ runner.os }}-
8692
93+
# Figure out where wkhtmltopdf is installed
94+
- name: 'Determine wkhtmltopdf location'
95+
run: echo ::set-env name=WICKED_PDF_PATH::$(echo `bundle exec which wkhtmltopdf`)
96+
8797
# Install the JS dependencies
8898
- name: 'Yarn Install'
8999
run: |

0 commit comments

Comments
 (0)