Skip to content

Commit

Permalink
Merge pull request #139 from xsnippet/action-setup-postgres
Browse files Browse the repository at this point in the history
Use `ikalnytskyi/action-setup-postgres` action
  • Loading branch information
ikalnytskyi authored Nov 25, 2021
2 parents 8282b81 + 926080f commit 40f5160
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 70 deletions.
63 changes: 0 additions & 63 deletions .github/actions/setup-postgres/action.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ jobs:
toolchain: ${{ matrix.rust-version }}
override: true

- uses: ./.github/actions/setup-postgres
- name: Setup PostgreSQL
uses: ikalnytskyi/action-setup-postgres@v1

- uses: actions-rs/cargo@v1
with:
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,13 @@ jobs:
toolchain: ${{ matrix.rust-version }}
override: true

- name: Start PostgreSQL
uses: ./.github/actions/setup-postgres
- name: Setup PostgreSQL
uses: ikalnytskyi/action-setup-postgres@v1
id: postgres

- name: Set ROCKET_DATABASE_URL
run: |
echo "ROCKET_DATABASE_URL=postgresql://postgres:postgres@localhost/postgres" >> $GITHUB_ENV
echo "ROCKET_DATABASE_URL=${{ steps.postgres.outputs.connection-uri }}" >> $GITHUB_ENV
- name: Install Alembic and psycopg2
run: |
Expand Down Expand Up @@ -118,11 +119,12 @@ jobs:
toolchain: nightly
override: true

- name: Start PostgreSQL
uses: ./.github/actions/setup-postgres
- name: Setup PostgreSQL
uses: ikalnytskyi/action-setup-postgres@v1
id: postgres

- run: |
echo "ROCKET_DATABASE_URL=postgresql://postgres:postgres@localhost/postgres" >> $GITHUB_ENV
echo "ROCKET_DATABASE_URL=${{ steps.postgres.outputs.connection-uri }}" >> $GITHUB_ENV
- run: cargo build
- run: python -m venv testvenv
Expand Down

0 comments on commit 40f5160

Please sign in to comment.