diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ad3dd96..b61eba6 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -6,11 +6,6 @@ on: pull_request: branches: [ "v0.2" ] -env: - POSTGRES_VERSION: "17.4" - POSTGRES_USER: "postgres" - POSTGRES_DB: "icarus_db" - jobs: build: runs-on: ubuntu-24.04 @@ -19,8 +14,8 @@ jobs: image: postgres:17.4 env: POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} - POSTGRES_USER: icarus - POSTGRES_DB: icarus_db + POSTGRES_USER: ${{ secrets.POSTGRES_USER }} + POSTGRES_DB: ${{ secrets.POSTGRES_DB }} ports: - 5432:5432 options: >- @@ -47,11 +42,11 @@ jobs: - name: Setup test database env: - DATABASE_URL: "postgres://icarus:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/icarus_db" + DATABASE_URL: "postgres://${{ secrets.POSTGRES_USER }}:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}" run: | # Wait for PostgreSQL to be ready for i in {1..10}; do - pg_isready -U icarus -d icarus_db && break + pg_isready -U ${{ secrets.POSTGRES_USER }} -d ${{ secrets.POSTGRES_DB }} && break sleep 2 done @@ -71,11 +66,11 @@ jobs: - name: Run tests env: - DATABASE_URL: "postgres://icarus:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/icarus_db" + DATABASE_URL: "postgres://${{ secrets.POSTGRES_USER }}:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}" run: cargo test --verbose - name: Run clippy run: cargo clippy -- -D warnings - name: Run rustfmt - run: cargo fmt --all -- --check \ No newline at end of file + run: cargo fmt --all -- --check