Pre-prepare SQLX queries to simplify bundler CI

DiamondLightSource · Jan 8, 2025 · 54237fc · 54237fc
1 parent 548512d
commit 54237fc
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 55 deletions.
diff --git a/.github/workflows/_bundler_container.yaml b/.github/workflows/_bundler_container.yaml
@@ -9,21 +9,16 @@ jobs:
     permissions:
       contents: read
       packages: write
-    services:
-      ispyb:
-        image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
-        ports:
-          - 3306:3306
-        env:
-          MARIADB_ROOT_PASSWORD: rootpassword
-        options: >-
-          --health-cmd "/usr/local/bin/healthcheck.sh --defaults-file=/ispyb/.my.cnf --connect"
-          --health-interval 1s
-          --health-retries 60
     steps:
       - name: Checkout source
         uses: actions/[email protected]
 
+      - name: Download Prepared Queries Artifact
+        uses: actions/[email protected]
+        with:
+          name: prepared-queries
+          path: .sqlx
+
       - name: Generate Image Name
         run: echo IMAGE_REPOSITORY=ghcr.io/$(echo "${{ github.repository }}-bundler" | tr '[:upper:]' '[:lower:]' | tr '[_]' '[\-]') >> $GITHUB_ENV
 
@@ -52,7 +47,6 @@ jobs:
       - name: Build & Publish Image
         uses: docker/[email protected]
         with:
-          build-args: DATABASE_URL=mysql://root:rootpassword@localhost:3306/ispyb_build
           context: bundler/
           push: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }}
           load: ${{ !(github.event_name == 'push' && startsWith(github.ref, 'refs/tags')) }}

diff --git a/.github/workflows/_bundler_docs.yaml b/.github/workflows/_bundler_docs.yaml
@@ -6,23 +6,16 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    services:
-      ispyb:
-        image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
-        ports:
-          - 3306:3306
-        env:
-          MARIADB_ROOT_PASSWORD: rootpassword
-        options: >-
-          --health-cmd "/usr/local/bin/healthcheck.sh --defaults-file=/ispyb/.my.cnf --connect"
-          --health-interval 1s
-          --health-retries 60
-    env:
-      DATABASE_URL: mysql://root:rootpassword@localhost/ispyb_build
     steps:
       - name: Checkout source
         uses: actions/[email protected]
 
+      - name: Download Prepared Queries Artifact
+        uses: actions/[email protected]
+        with:
+          name: prepared-queries
+          path: .sqlx
+
       - name: Install stable toolchain
         uses: actions-rs/[email protected]
         with:

diff --git a/.github/workflows/_bundler_lint.yaml b/.github/workflows/_bundler_lint.yaml
@@ -6,23 +6,16 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
-    services:
-      ispyb:
-        image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
-        ports:
-          - 3306:3306
-        env:
-          MARIADB_ROOT_PASSWORD: rootpassword
-        options: >-
-          --health-cmd "/usr/local/bin/healthcheck.sh --defaults-file=/ispyb/.my.cnf --connect"
-          --health-interval 1s
-          --health-retries 60
-    env:
-      DATABASE_URL: mysql://root:rootpassword@localhost/ispyb_build
     steps:
       - name: Checkout source
         uses: actions/[email protected]
 
+      - name: Download Prepared Queries Artifact
+        uses: actions/[email protected]
+        with:
+          name: prepared-queries
+          path: .sqlx
+
       - name: Install stable toolchain
         uses: actions-rs/[email protected]
         with:

diff --git a/.github/workflows/_bundler_sqlx.yaml b/.github/workflows/_bundler_sqlx.yaml
@@ -0,0 +1,48 @@
+name: Bundler SQLX
+
+on:
+  workflow_call:
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    services:
+      ispyb:
+        image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
+        ports:
+          - 3306:3306
+        env:
+          MARIADB_ROOT_PASSWORD: rootpassword
+        options: >-
+          --health-cmd "/usr/local/bin/healthcheck.sh --defaults-file=/ispyb/.my.cnf --connect"
+          --health-interval 1s
+          --health-retries 60
+    env:
+      DATABASE_URL: mysql://root:rootpassword@ispyb/ispyb_build
+    steps:
+      - name: Checkout source
+        uses: actions/[email protected]
+
+      - name: Install stable toolchain
+        uses: actions-rs/[email protected]
+        with:
+          toolchain: stable
+          default: true
+
+      - name: Cache Rust Build
+        uses: Swatinem/[email protected]
+
+      - name: Install SQLX CLI
+        run: cargo install sqlx-cli
+
+      - name: Prepare SQLX Query
+        working-directory: bundler
+        run: >-
+          cargo sqlx prepare
+
+      - name: Upload Prepared Queries Artifact
+        uses: actions/[email protected]
+        with:
+          name: prepared-queries
+          path: .sqlx
+
diff --git a/.github/workflows/_bundler_test.yaml b/.github/workflows/_bundler_test.yaml
@@ -6,23 +6,16 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    services:
-      ispyb:
-        image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
-        ports:
-          - 3306:3306
-        env:
-          MARIADB_ROOT_PASSWORD: rootpassword
-        options: >-
-          --health-cmd "/usr/local/bin/healthcheck.sh --defaults-file=/ispyb/.my.cnf --connect"
-          --health-interval 1s
-          --health-retries 60
-    env:
-      DATABASE_URL: mysql://root:rootpassword@localhost/ispyb_build
     steps:
       - name: Checkout source
         uses: actions/[email protected]
 
+      - name: Download Prepared Queries Artifact
+        uses: actions/[email protected]
+        with:
+          name: prepared-queries
+          path: .sqlx
+
       - name: Install stable toolchain
         uses: actions-rs/[email protected]
         with:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,17 +16,26 @@ jobs:
     needs: deduplicate
     uses: ./.github/workflows/_devcontainer.yaml
 
-  bundler_lint:
+  bundler_sqlx:
     needs: deduplicate
+    uses: ./.github/workflows/_bundler_sqlx.yaml
+
+  bundler_lint:
+    needs:
+      - deduplicate
+      - bundler_sqlx
     uses: ./.github/workflows/_bundler_lint.yaml
 
   bundler_test:
-    needs: deduplicate
+    needs:
+      - deduplicate
+      - bundler_sqlx
     uses: ./.github/workflows/_bundler_test.yaml
 
   bundler_container:
-    needs: 
+    needs:
       - deduplicate
+      - bundler_sqlx
       - bundler_lint
       - bundler_test
     permissions:
@@ -35,7 +44,9 @@ jobs:
     uses: ./.github/workflows/_bundler_container.yaml
 
   bundler_docs:
-    needs: deduplicate
+    needs:
+      - deduplicate
+      - bundler_sqlx
     uses: ./.github/workflows/_bundler_docs.yaml
 
   policy_lint: