Static(ish) build in Windows and MacOs + darwin/amd64 build

Author: proofrock

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   GO_VERSION: "1.23.5"
-  REGISTRY_IMAGE: "ghcr.io/proofrock/ws4sql"
+  REGISTRY_IMAGE: "ghcr.io/proofrock/ws4sql_test"
 
 jobs:
   test:
@@ -46,7 +46,7 @@ jobs:
       - name: Compile and Pack Artifact
         run: |
           apk add --no-cache musl-dev go g++ git make openssl openssl-dev openssl-libs-static zstd
-          make build-static-linux-musl-amd64
+          make build-static-ci-linux-musl-amd64
           tar czf bin/ws4sql-${{ github.ref_name }}-linux-amd64.tar.gz -C bin/ ws4sql
         shell: alpine.sh --root {0}
 
@@ -80,7 +80,7 @@ jobs:
       - name: Compile and Pack Artifact
         run: |
           apk add --no-cache musl-dev go g++ git make openssl openssl-dev openssl-libs-static zstd
-          make build-static-linux-musl-arm64
+          make build-static-ci-linux-musl-arm64
           tar czf bin/ws4sql-${{ github.ref_name }}-linux-arm64.tar.gz -C bin/ ws4sql
         shell: alpine.sh --root {0}
 
@@ -111,7 +111,7 @@ jobs:
 
       - name: Compile and Pack Artifact
         run: |
-          make build
+          make build-static-macos
           tar czf bin/ws4sql-${{ github.ref_name }}-macos-arm64.tar.gz -C bin/ ws4sql
           rm bin/ws4sql
 
@@ -122,6 +122,37 @@ jobs:
           path: bin/ws4sql-${{ github.ref_name }}-macos-arm64.tar.gz
           retention-days: 1
 
+  build_macos_amd64:
+    runs-on: macos-13
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Modify version number
+        run: sed -i.bkp 's/v0\.0\.0/${{ github.ref_name }}/g' ws4sql.go
+        working-directory: src/
+
+      - name: Build dir generation
+        run: mkdir bin/
+
+      - name: Compile and Pack Artifact
+        run: |
+          make build-static-macos
+          tar czf bin/ws4sql-${{ github.ref_name }}-macos-amd64.tar.gz -C bin/ ws4sql
+          rm bin/ws4sql
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: binary_macos_amd64
+          path: bin/ws4sql-${{ github.ref_name }}-macos-amd64.tar.gz
+          retention-days: 1
+
   build_win_amd64:
     runs-on: windows-latest
 
@@ -145,7 +176,7 @@ jobs:
 
       - name: Compile and Pack Artifact
         run: |
-          make build-windows
+          make build-static-windows
           zip -j -9 bin/ws4sql-${{ github.ref_name }}-win-amd64.zip bin/ws4sql.exe
           rm bin/ws4sql.exe
 
@@ -236,31 +267,38 @@ jobs:
       - build_linux_amd64
       - build_linux_arm64
       - build_macos_arm64
+      - build_macos_amd64
       - build_win_amd64
       - build_docker
       - test
     runs-on: ubuntu-latest
 
     steps:
-      - name: Download artifacts [1/4]
+      - name: Download artifacts [1/5]
         uses: actions/download-artifact@v4
         with:
           name: binary_linux_amd64
           path: bin/
 
-      - name: Download artifacts [2/4]
+      - name: Download artifacts [2/5]
         uses: actions/download-artifact@v4
         with:
           name: binary_linux_arm64
           path: bin/
 
-      - name: Download artifacts [3/4]
+      - name: Download artifacts [3/5]
         uses: actions/download-artifact@v4
         with:
           name: binary_macos_arm64
           path: bin/
 
-      - name: Download artifacts [4/4]
+      - name: Download artifacts [4/5]
+        uses: actions/download-artifact@v4
+        with:
+          name: binary_macos_amd64
+          path: bin/
+
+      - name: Download artifacts [5/5]
         uses: actions/download-artifact@v4
         with:
           name: binary_win_amd64
@@ -311,6 +349,16 @@ jobs:
           asset_name: ws4sql-${{ github.ref_name }}-macos-arm64.tar.gz
           asset_content_type: application/zip
 
+      - name: Release Artifact [darwin/amd64]
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: bin/ws4sql-${{ github.ref_name }}-macos-amd64.tar.gz
+          asset_name: ws4sql-${{ github.ref_name }}-macos-amd64.tar.gz
+          asset_content_type: application/zip
+
       - name: Release Artifact [windows/amd64]
         uses: actions/upload-release-asset@v1
         env:

Makefile

@@ -1,9 +1,5 @@
 .PHONY: test
 
-build-prepare:
-	make cleanup
-	mkdir bin
-
 cleanup:
 	- rm -r bin
 	- rm src/ws4sql
@@ -12,39 +8,49 @@ cleanup:
 upd-libraries:
 	cd src; go get -u
 	cd src; go mod tidy
+	
+test:
+	cd src; go test -v -timeout 6m
 
-build:
+build-prepare:
+	make cleanup
+	mkdir bin
+
+build-nostatic:
 	make build-prepare
 	cd src; go build -trimpath
 	mv src/ws4sql bin/
 
-build-windows:
+build-static-linux:
 	make build-prepare
-	cd src; go build -trimpath
-	mv src/ws4sql.exe bin/
+	cd src; go build -trimpath -a -tags="netgo osusergo sqlite_omit_load_extension" -ldflags='-w -extldflags "-static"'
+	mv src/ws4sql bin/
 
-build-static:
+build-static-windows:
 	make build-prepare
 	cd src; go build -trimpath -a -tags="netgo osusergo sqlite_omit_load_extension" -ldflags='-w -extldflags "-static"'
-	mv src/ws4sql bin/
+	mv src/ws4sql.exe bin/
 
-build-static-linux-musl-amd64:
-	# In an Alpine Linux context with the following packages
-	#   musl-dev go g++ make openssl openssl-dev openssl-libs-static zstd
+build-static-macos:
 	make build-prepare
-	cp precompiled/libduckdb_bundle/linux-musl-amd64/libduckdb_bundle.a.zst src/
-	cd src && zstd -d libduckdb_bundle.a.zst
-	cd src && CGO_CFLAGS="-O2 -fPIC" CGO_CXXFLAGS="-O2 -fPIC" CGO_LDFLAGS="-lduckdb_bundle -lssl -lcrypto -L./" go build -buildvcs=false -trimpath -a -tags="netgo osusergo sqlite_omit_load_extension duckdb_use_static_lib" -ldflags='-w -extldflags "-static"'
+	cd src; go build -trimpath -a -tags="netgo osusergo sqlite_omit_load_extension" -ldflags='-w'
 	mv src/ws4sql bin/
 
-build-static-linux-musl-arm64:
-	# In an Alpine Linux context with the following packages
-	#   musl-dev go g++ make openssl openssl-dev openssl-libs-static zstd
+# The following three targets are used in Github Actions
+# Can be also run in an Alpine Linux context with the following packages
+#   musl-dev go g++ make openssl openssl-dev openssl-libs-static zstd
+
+build-static-ci-common:
 	make build-prepare
-	cp precompiled/libduckdb_bundle/linux-musl-arm64/libduckdb_bundle.a.zst src/
 	cd src && zstd -d libduckdb_bundle.a.zst
 	cd src && CGO_CFLAGS="-O2 -fPIC" CGO_CXXFLAGS="-O2 -fPIC" CGO_LDFLAGS="-lduckdb_bundle -lssl -lcrypto -L./" go build -buildvcs=false -trimpath -a -tags="netgo osusergo sqlite_omit_load_extension duckdb_use_static_lib" -ldflags='-w -extldflags "-static"'
 	mv src/ws4sql bin/
+	rm src/libduckdb_bundle.a
 
-test:
-	cd src; go test -v -timeout 6m
+build-static-ci-linux-musl-amd64:
+	cp precompiled/libduckdb_bundle/linux-musl-amd64/libduckdb_bundle.a.zst src/
+	make build-static-ci-common
+
+build-static-ci-linux-musl-arm64:
+	cp precompiled/libduckdb_bundle/linux-musl-arm64/libduckdb_bundle.a.zst src/
+	make build-static-ci-common