CI improvements and cleanup (#111)

* ci: check sqlx prepare up to date Signed-off-by: Alexis Asseman <[email protected]> * chore: move release.yml to appropriate dir Signed-off-by: Alexis Asseman <[email protected]> * ci: removing gen-binaries Looks incorrect. We can reintroduce something similar later. Signed-off-by: Alexis Asseman <[email protected]> --------- Signed-off-by: Alexis Asseman <[email protected]>
graphprotocol · Jan 15, 2024 · 123acf8 · 123acf8
1 parent 505fbb1
commit 123acf8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 66 deletions.
diff --git a/.github/workflows/release.yml → .github/release.yml b/.github/workflows/release.yml → .github/release.yml
diff --git a/.github/workflows/gen-binaries.yml b/.github/workflows/gen-binaries.yml
diff --git a/.github/workflows/license_headers_check.yml b/.github/workflows/license_headers_check.yml
@@ -25,6 +25,8 @@ jobs:
             -l "apache" \
             -s=only \
             -ignore '.github/workflows/*.yml' \
+            -ignore '.github/*.yml' \
             -ignore '.github/workflows/*.yaml' \
+            -ignore '.github/*.yaml' \
             -ignore 'migrations/*.sql' \
-            .
+            .
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,8 +18,8 @@ jobs:
           rustup component add rustfmt
           cargo fmt --all -- --check
 
-  clippy:
-    name: cargo clippy
+  sqlx:
+    name: prepared query metadata is up-to-date
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -36,7 +36,7 @@ jobs:
     container: 
       image: rust:1.74-bookworm
     env:
-      DATABASE_URL: postgres://postgres@postgres:5432 
+      DATABASE_URL: postgres://postgres@postgres:5432
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
@@ -47,11 +47,33 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-clippy-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-sqlx-prepare-${{ hashFiles('**/Cargo.lock') }}
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
         run: cargo sqlx migrate run
+      - name: Check that the sqlx prepared query metadata is up-to-date
+        run: cargo sqlx prepare --workspace --check -- --all-targets --all-features
+
+  clippy:
+    name: cargo clippy
+    runs-on: ubuntu-latest
+    container: 
+      image: rust:1.74-bookworm
+    env:
+      DATABASE_URL: postgres://postgres@postgres:5432 
+      SQLX_OFFLINE: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-clippy-${{ hashFiles('**/Cargo.lock') }}
       - run: |
           rustup component add clippy
           # Temporarily allowing dead-code, while denying all other warnings