progress

Author: psteinroe

.github/workflows/pull_request.yml

@@ -79,23 +79,20 @@ jobs:
   lint:
     name: Lint Project
     runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
     steps:
       - name: Checkout PR Branch
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Build and start postgres with plpgsql_check
-        run: |
-          docker build -t postgres-plpgsql-check:latest .
-          docker run -d --name postgres \
-            -e POSTGRES_USER=postgres \
-            -e POSTGRES_PASSWORD=postgres \
-            -e POSTGRES_DB=postgres \
-            -p 5432:5432 \
-            postgres-plpgsql-check:latest
-          # Wait for postgres to be ready
-          sleep 5
-          docker exec postgres pg_isready -U postgres
       - name: Free Disk Space
         uses: ./.github/actions/free-disk-space
       - name: Install toolchain
@@ -157,33 +154,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Build and run custom postgres image with plpgsql_check
-      - name: Build and start postgres with plpgsql_check
-        if: runner.os == 'Linux'
-        run: |
-          docker build -t postgres-plpgsql-check:latest .
-          docker run -d --name postgres \
-            -e POSTGRES_USER=postgres \
-            -e POSTGRES_PASSWORD=postgres \
-            -e POSTGRES_DB=postgres \
-            -p 5432:5432 \
-            postgres-plpgsql-check:latest
-          # Wait for postgres to be ready
-          sleep 5
-          docker exec postgres pg_isready -U postgres
-      - name: Build and start postgres with plpgsql_check (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          docker build -t postgres-plpgsql-check:latest .
-          docker run -d --name postgres -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres -p 5432:5432 postgres-plpgsql-check:latest
-          Start-Sleep -Seconds 5
-          docker exec postgres pg_isready -U postgres
+      # running containers via `services` only works on linux
+      # https://github.com/actions/runner/issues/1866
+      - name: Setup postgres
+        id: postgres
+        uses: ikalnytskyi/action-setup-postgres@v7
       - name: Print Roles
-        if: runner.os == 'Linux'
-        run: docker exec postgres psql -U postgres -c "select rolname from pg_roles;"
-      - name: Print Roles (Windows)
-        if: runner.os == 'Windows'
-        run: docker exec postgres psql -U postgres -c "select rolname from pg_roles;"
+        run: psql ${{ steps.postgres.outputs.connection-uri }} -c "select rolname from pg_roles;"
       - name: Run tests
         run: cargo test --workspace
 
@@ -192,23 +169,20 @@ jobs:
       Test JS Bindings
       # use the same image we use for compiling
     runs-on: ubuntu-22.04
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
     steps:
       - name: Checkout PR branch
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Build and start postgres with plpgsql_check
-        run: |
-          docker build -t postgres-plpgsql-check:latest .
-          docker run -d --name postgres \
-            -e POSTGRES_USER=postgres \
-            -e POSTGRES_PASSWORD=postgres \
-            -e POSTGRES_DB=postgres \
-            -p 5432:5432 \
-            postgres-plpgsql-check:latest
-          # Wait for postgres to be ready
-          sleep 5
-          docker exec postgres pg_isready -U postgres
       - name: Free Disk Space
         uses: ./.github/actions/free-disk-space
       - name: Install toolchain
@@ -231,23 +205,20 @@ jobs:
   codegen:
     name: Check Codegen
     runs-on: ubuntu-22.04
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
     steps:
       - name: Checkout PR branch
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Build and start postgres with plpgsql_check
-        run: |
-          docker build -t postgres-plpgsql-check:latest .
-          docker run -d --name postgres \
-            -e POSTGRES_USER=postgres \
-            -e POSTGRES_PASSWORD=postgres \
-            -e POSTGRES_DB=postgres \
-            -p 5432:5432 \
-            postgres-plpgsql-check:latest
-          # Wait for postgres to be ready
-          sleep 5
-          docker exec postgres pg_isready -U postgres
       - name: Free Disk Space
         uses: ./.github/actions/free-disk-space
       - name: Install toolchain

crates/pgt_plpgsql_check/src/lib.rs

@@ -231,7 +231,7 @@ pub async fn check_plpgsql(
     Ok(diagnostics)
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_os = "windows")))]
 mod tests {
     use sqlx::{Executor, PgPool};