* validate Dockerfile is up to date in github action (#45)

* rename SqlcGenCsharpWasm & SqlcGenCsharpProcess projects

Author: SockworkOrange

.env

@@ -1,5 +1,5 @@
-SOURCE_WASM_FILE_UBUNTU="SqlcGenCsharpWasm/obj/release/net8.0/wasi-wasm/wasm/for-publish/SqlcGenCsharpWasm.wasm"
-SOURCE_WASM_FILE="SqlcGenCsharpWasm/bin/Release/net8.0/wasi-wasm/AppBundle/SqlcGenCsharpWasm.wasm"
+SOURCE_WASM_FILE_UBUNTU="WasmRunner/obj/release/net8.0/wasi-wasm/wasm/for-publish/WasmRunner.wasm"
+SOURCE_WASM_FILE="WasmRunner/bin/Release/net8.0/wasi-wasm/AppBundle/WasmRunner.wasm"
 TESTS_CONTAINER_NAME="plugin-tests"
 MYSQL_CONNECTION_STRING="server=mysqldb;database=tests;user=root"
 POSTGRES_CONNECTION_STRING="host=postgresdb;database=tests;username=user;password=pass"

.github/workflows/main.yml

@@ -77,17 +77,22 @@ jobs:
 
       - name: Dotnet Wasm Publish
         run: |
-          WASI_SDK_PATH="$(pwd)/wasi-sdk-22.0" dotnet publish SqlcGenCsharpWasm -c release
+          WASI_SDK_PATH="$(pwd)/wasi-sdk-22.0" dotnet publish WasmRunner -c release
           ./scripts/wasm/copy_to_dist.sh 
           ./scripts/wasm/update_sha.sh
           
       - uses: sqlc-dev/setup-sqlc@v4
         with:
           sqlc-version: '1.25.0'
 
-      - name: Verify pushed generated code is up to date
+      - name: Verify pushed generated code is synced
         run: sqlc -f sqlc.wasm.yaml diff
 
+      - name: Verify pushed Dockerfile is synced
+        run: |
+          ./scripts/generate_dockerfile.sh /tmp/Dockerfile
+          diff /tmp/Dockerfile Dockerfile
+        
       - name: Sqlc generate using Wasm plugin
         run: sqlc -f sqlc.wasm.yaml generate
 

Dockerfile

@@ -11,10 +11,10 @@ COPY GeneratedProtobuf/*.csproj ./GeneratedProtobuf/
 COPY MySqlConnectorExample/*.csproj ./MySqlConnectorExample/
 COPY NpgsqlExample/*.csproj ./NpgsqlExample/
 COPY PluginOptions/*.csproj ./PluginOptions/
+COPY ProcessRunner/*.csproj ./ProcessRunner/
 COPY SqlcGenCsharp/*.csproj ./SqlcGenCsharp/
-COPY SqlcGenCsharpProcess/*.csproj ./SqlcGenCsharpProcess/
 COPY SqlcGenCsharpTests/*.csproj ./SqlcGenCsharpTests/
-COPY SqlcGenCsharpWasm/*.csproj ./SqlcGenCsharpWasm/
+COPY WasmRunner/*.csproj ./WasmRunner/
 
 COPY CodeGenerator/ ./CodeGenerator/
 COPY Drivers/ ./Drivers/
@@ -23,9 +23,9 @@ COPY GeneratedProtobuf/ ./GeneratedProtobuf/
 COPY MySqlConnectorExample/ ./MySqlConnectorExample/
 COPY NpgsqlExample/ ./NpgsqlExample/
 COPY PluginOptions/ ./PluginOptions/
+COPY ProcessRunner/ ./ProcessRunner/
 COPY SqlcGenCsharp/ ./SqlcGenCsharp/
-COPY SqlcGenCsharpProcess/ ./SqlcGenCsharpProcess/
 COPY SqlcGenCsharpTests/ ./SqlcGenCsharpTests/
-COPY SqlcGenCsharpWasm/ ./SqlcGenCsharpWasm/
+COPY WasmRunner/ ./WasmRunner/
 
 RUN dotnet restore

Makefile

@@ -8,7 +8,7 @@ dotnet-format:
 		--exclude NpgsqlExample
 
 dockerfile-generate:
-	./scripts/generate_dockerfile.sh
+	./scripts/generate_dockerfile.sh Dockerfile
 
 protobuf-generate:
 	./scripts/generate_protobuf.sh

SqlcGenCsharpProcess/App.cs ProcessRunner/App.cs

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-cat <<EOF > Dockerfile
+filename=$1
+
+cat <<EOF > "$filename"
 # auto-generated by $0 - do not edit
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 
@@ -11,11 +13,11 @@ EOF
 
 projects=$(dotnet sln list | grep csproj | awk -F'/' '{print $1}')
 for project in $projects; do
-    echo "COPY $project/*.csproj ./$project/" >> Dockerfile
+    echo "COPY $project/*.csproj ./$project/" >> "$filename"
 done
-echo "" >> Dockerfile
+echo "" >> "$filename"
 for project in $projects; do
-    echo "COPY $project/ ./$project/" >> Dockerfile
+    echo "COPY $project/ ./$project/" >> "$filename"
 done
-echo "" >> Dockerfile
-echo "RUN dotnet restore" >> Dockerfile
+echo "" >> "$filename"
+echo "RUN dotnet restore" >> "$filename"

SqlcGenCsharpProcess/SqlcGenCsharpProcess.csproj ProcessRunner/ProcessRunner.csproj

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlcGenCsharpProcess", "SqlcGenCsharpProcess\SqlcGenCsharpProcess.csproj", "{649CFB46-68D1-41F8-BD76-FF4B79B16825}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessRunner", "ProcessRunner\ProcessRunner.csproj", "{649CFB46-68D1-41F8-BD76-FF4B79B16825}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySqlConnectorExample", "MySqlConnectorExample\MySqlConnectorExample.csproj", "{6406B659-77CF-4978-ABD3-BFBB2CBFFCA3}"
 EndProject
@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlcGenCsharpTests", "SqlcG
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlExample", "NpgsqlExample\NpgsqlExample.csproj", "{86C6A2E3-C58C-4891-9B7B-296C36020185}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlcGenCsharpWasm", "SqlcGenCsharpWasm\SqlcGenCsharpWasm.csproj", "{D3095033-1C96-42D9-AE44-3D4F1B24CB51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WasmRunner", "WasmRunner\WasmRunner.csproj", "{D3095033-1C96-42D9-AE44-3D4F1B24CB51}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlcGenCsharp", "SqlcGenCsharp\SqlcGenCsharp.csproj", "{B83D6813-3B06-4E23-B2FC-47078CB90B83}"
 EndProject