added macos-latest to ci

.env

@@ -1,5 +1,5 @@
 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"
+SOURCE_WASM_FILE_MACOS="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

@@ -39,15 +39,14 @@ jobs:
             MySqlConnectorExample
             NpgsqlExample
 
-
   ci:
     name: CI
     runs-on: ${{ matrix.os }}
     if: ${{ always() }}
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        architecture: [ "x64", "arm64" ]
+        os: [ ubuntu-latest, macos-13 ]
+        architecture: [ "x64" ] # , "arm64"
         dotnet-version: [ '8.0.x' ]
 
     steps:
@@ -62,7 +61,7 @@ jobs:
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
 
-      - name: install Wasi workload
+      - name: Install Wasi workload
         run: dotnet workload install wasi-experimental
 
       - name: Download Wasi SDK on Ubuntu
@@ -71,6 +70,13 @@ jobs:
           wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz
           tar xf wasi-sdk-22.0-linux.tar.gz
           chmod -R 755 wasi-sdk-22.0
+
+      - name: Download Wasi SDK on MacOS
+        if: runner.os == 'macOS'
+        run: |
+          wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-macos.tar.gz
+          tar xf wasi-sdk-22.0-macos.tar.gz
+          chmod -R 755 wasi-sdk-22.0
 
       #  name: Download WASI SDK on Windows
       #   run: |
@@ -98,18 +104,19 @@ jobs:
 
       - name: Sqlc generate using Wasm plugin
         run: sqlc -f sqlc.wasm.yaml generate
-
-      - uses: hoverkraft-tech/[email protected]
-        with:
-         services: |
-           mysqldb
-           postgresdb
-           plugin-tests
+
+#      - name: Setup Docker support via Colima on MacOS
+#        if: runner.os == 'macOS'
+#        run: |
+#          set -x
+#          brew install docker docker-compose
+#          open -a $(which docker)
+#          sleep 4
 
       - name: Test generated code
         run: |
-           chmod +x ./scripts/run_tests.sh
-           ./scripts/run_tests.sh
+          docker-compose up -d
+          ./scripts/run_tests.sh
 
       - name: upload wasm plugin as artifact
         uses: actions/upload-artifact@v2

docker-compose.yml

@@ -19,8 +19,8 @@ services:
     ports:
       - "3306:3306"
     environment:
-      MYSQL_DATABASE: tests
-      MYSQL_ALLOW_EMPTY_PASSWORD: true
+      MYSQL_DATABASE: "tests"
+      MYSQL_ALLOW_EMPTY_PASSWORD: "true"
     healthcheck:
       test: "mysqladmin ping -h 127.0.0.1"
       timeout: 20s

scripts/wasm/copy_to_dist.sh

@@ -3,10 +3,11 @@
 set -e
 source .env
 
-if [ "${GITHUB_ACTIONS}" = "true" ]; then
+RUNNER_OS=$(uname -s)
+if [ "${RUNNER_OS}" == "Darwin" ]; then
+    WASM_FILE="${SOURCE_WASM_FILE_MACOS}"
+elif [ "${RUNNER_OS}" == "Linux" ]; then
     WASM_FILE="${SOURCE_WASM_FILE_UBUNTU}"
-else
-    WASM_FILE="${SOURCE_WASM_FILE}"
 fi
 
 echo "WASM_FILE = ${WASM_FILE}"