split ci job to build and test (#51)

Author: SockworkOrange

.github/workflows/main.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "8.0.x"
 
@@ -38,12 +38,16 @@ jobs:
             GeneratedProtobuf
             MySqlConnectorExample
             NpgsqlExample
-
+            
+      - name: Verify pushed Dockerfile is synced
+        run: |
+          ./scripts/generate_dockerfile.sh /tmp/Dockerfile
+          diff /tmp/Dockerfile Dockerfile
   
-  ci:
-    name: CI
+  build:
+    name: Build & Generate
     runs-on: ${{ matrix.os }}
-    if: ${{ always() }}
+    needs: [lint]
     strategy:
       matrix:
         os: [ 'ubuntu-latest' ]
@@ -82,13 +86,7 @@ jobs:
       - name: Dotnet Wasm Publish
         run: |
           WASI_SDK_PATH="$(pwd)/wasi-sdk-22.0" dotnet publish WasmRunner -c release
-          ./scripts/wasm/copy_to_dist.sh 
-          ./scripts/wasm/update_sha.sh
-          
-      - name: Verify pushed Dockerfile is synced
-        run: |
-          ./scripts/generate_dockerfile.sh /tmp/Dockerfile
-          diff /tmp/Dockerfile Dockerfile
+          ./scripts/wasm/copy_plugin_to.sh dist
           
       - uses: sqlc-dev/setup-sqlc@v4
         with:
@@ -97,42 +95,64 @@ jobs:
       - name: Updating configuration
         env:
           FILE_PER_QUERY: ${{ matrix.file-per-query }}
-        run: ./scripts/update_config.sh $FILE_PER_QUERY
-        
-      - name: Verify pushed generated code is synced
-        if: matrix.file-per-query == 'false'
-        run: sqlc -f sqlc.wasm.yaml diff
+        run: |
+          ./scripts/wasm/update_sha.sh sqlc.ci.yaml
+          ./scripts/update_config.sh sqlc.ci.yaml $FILE_PER_QUERY
       
       - name: Sqlc generate using Wasm plugin
         run: |
           rm MySqlConnectorExample/*.cs NpgsqlExample/*.cs
-          sqlc -f sqlc.wasm.yaml generate
+          sqlc -f sqlc.ci.yaml generate
+          
+      - name: upload wasm plugin as artifact
+        if: matrix.file-per-query == 'false' && matrix.architecture == 'arm64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: wasm-file
+          path: dist/plugin.wasm
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    needs: [build]
 
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: wasm-file
+          path: dist
+          
+      - uses: sqlc-dev/setup-sqlc@v4
+        with:
+          sqlc-version: '1.25.0'
+          
+      - name: Verify pushed generated code is synced
+        run: |
+          ./scripts/wasm/update_sha.sh sqlc.ci.yaml
+          sqlc -f sqlc.ci.yaml diff
+        
       - name: Docker compose
-        if: matrix.file-per-query == 'false'
         uses: hoverkraft-tech/[email protected]
         with:
           services: |
             mysqldb
             postgresdb
             plugin-tests
-            
+
+      - name: Load .env file
+        uses: xom9ikk/[email protected]
+        with:
+          load-mode: strict
+          
       - name: Test generated code
-        if: matrix.file-per-query == 'false'
         run: ./scripts/run_tests.sh
-          
-      - name: upload wasm plugin as artifact
-        uses: actions/upload-artifact@v2
-        if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[release]')
-        with:
-          name: wasm-file
-          path: dist/plugin.wasm
-
+  
   release:
     name: Release
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[release]')
-    needs: [ci]
+    needs: [build, test]
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
@@ -142,7 +162,7 @@ jobs:
       - uses: actions/download-artifact@v2
         with:
           name: wasm-file
-          
+      
       - name: Bump version and create new tag
         id: bump_version
         run: |

.gitignore

@@ -135,3 +135,5 @@ _NCrunch*
 dist/*
 output/*
 docker-upload/*
+
+plugin.wasm

Makefile

@@ -32,13 +32,12 @@ test-process-plugin: sqlc-generate-process dockerfile-generate run-tests
 # WASM type plugin
 dotnet-publish-wasm: protobuf-generate
 	dotnet publish WasmRunner -c release --output dist/
-	./scripts/wasm/copy_to_dist.sh
+	./scripts/wasm/copy_plugin_to.sh dist
 
 update-wasm-plugin:
-	./scripts/wasm/update_sha.sh
+	./scripts/wasm/update_sha.sh sqlc.ci.yaml
 
 sqlc-generate-wasm: dotnet-publish-wasm update-wasm-plugin
-	SQLCCACHE=./; sqlc -f sqlc.wasm.yaml generate
-	yq -i ".plugins[0].wasm.sha256 = \"SHA_TO_REPLACE\"" sqlc.wasm.yaml
+	SQLCCACHE=./; sqlc -f sqlc.ci.yaml generate
 
-test-wasm-plugin: sqlc-generate-wasm dockerfile-generate run-tests
+test-wasm-plugin: sqlc-generate-wasm update-wasm-plugin dockerfile-generate run-tests

scripts/update_config.sh

@@ -2,6 +2,9 @@
 
 set -ex
 
-file_per_query=$1
-yq -i ".sql[0].codegen[0].options.filePerQuery = ${file_per_query}" sqlc.wasm.yaml
-yq -i ".sql[1].codegen[0].options.filePerQuery = ${file_per_query}" sqlc.wasm.yaml
+filename=$1
+file_per_query=$2
+yq -i "
+  .sql[0].codegen[0].options.filePerQuery = ${file_per_query} |
+  .sql[1].codegen[0].options.filePerQuery = ${file_per_query}
+" "$filename"

scripts/wasm/copy_to_dist.sh scripts/wasm/copy_plugin_to.sh

@@ -3,13 +3,13 @@
 set -e
 source .env
 
+target_dir=$1
 if [ "${GITHUB_ACTIONS}" = "true" ]; then
     WASM_FILE="${SOURCE_WASM_FILE_UBUNTU}"
 else
     WASM_FILE="${SOURCE_WASM_FILE}"
 fi
 
 echo "WASM_FILE = ${WASM_FILE}"
-mkdir -p dist
-cp "${WASM_FILE}" dist/plugin.wasm
-echo "WASM filesize:" && du -sh dist/plugin.wasm
+mkdir -p "${target_dir}" && cp "${WASM_FILE}" "${target_dir}/plugin.wasm"
+echo "WASM filesize:" && du -sh "${target_dir}/plugin.wasm"

scripts/wasm/update_sha.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
+filename=$1
 plugin_sha=$(shasum -a 256 dist/plugin.wasm | awk '{ print $1 }')
-yq -i ".plugins[0].wasm.sha256 = \"${plugin_sha}\"" sqlc.wasm.yaml
+yq -i ".plugins[0].wasm.sha256 = \"${plugin_sha}\"" "${filename}"

sqlc.wasm.yaml sqlc.ci.yaml

@@ -13,9 +13,9 @@ sql:
         out: NpgsqlExample
         options:
           driver: Npgsql
-          filePerQuery: BOOL_TO_REPLACE
-          #      targetFramework: netstandard2.0
-          #      generateCsproj: true
+          filePerQuery: false
+          targetFramework: net8.0
+          generateCsproj: true
   - schema: "examples/authors/mysql/schema.sql"
     queries: "examples/authors/mysql/query.sql"
     engine: "mysql"
@@ -24,6 +24,6 @@ sql:
         out: MySqlConnectorExample
         options:
           driver: MySqlConnector
-          filePerQuery: BOOL_TO_REPLACE
-          #      targetFramework: netstandard2.0
-          #      generateCsproj: true
+          filePerQuery: false
+          targetFramework: net8.0
+          generateCsproj: true