Fix workflows

.github/workflows/nodejs.yml

@@ -1,8 +1,6 @@
 name: NodeJS
 on:
   push:
-    branches:
-    - master
     tags:
     - 'v*'
   pull_request:

.github/workflows/python.yml

@@ -36,7 +36,7 @@ jobs:
         CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux_2_28_i686
         CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
         CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64
-        CIBW_BEFORE_ALL: .ci/ensure-go.sh; cd bindings/py; go build -buildmode=c-shared -o src/minify/minify.so
+        CIBW_BEFORE_ALL: .ci/ensure-go.sh; make -C bindings/py compile
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
@@ -61,14 +61,15 @@ jobs:
         go-version: '>=1.17'
     - name: Build Windows extension
       run: |
-        cd bindings/py
+        #cd bindings/py
         set GOOS=windows
         set GOARCH=${{ matrix.go_target }}
         set CGO_ENABLED=1
         #go get github.com/tdewolff/minify/v2@${{ github.ref_name }}
         #go mod init github.com/tdewolff/minify/bindings/js
         #go mod tidy
-        go build -buildmode=c-shared -o src/minify/minify.so
+        #go build -buildmode=c-shared -o src/minify/minify.so
+        make -C bindings/py compile
     - name: Build wheels
       uses: pypa/[email protected]
       with:
@@ -97,15 +98,16 @@ jobs:
         go-version: '>=1.17'
     - name: Build MacOS extension
       run: |
-        cd bindings/py
+        #cd bindings/py
         export GOOS=darwin
         export GOARCH=${{ matrix.go_target }}
         export CGO_ENABLED=1
         export MACOSX_DEPLOYMENT_TARGET=10.9
         #go get github.com/tdewolff/minify/v2@${{ github.ref_name }}
         #go mod init github.com/tdewolff/minify/bindings/js
         #go mod tidy
-        go build -buildmode=c-shared -o src/minify/minify.so
+        #go build -buildmode=c-shared -o src/minify/minify.so
+        make -C bindings/py compile
     - name: Build wheels
       uses: pypa/[email protected]
       with:

bindings/py/Makefile

@@ -3,11 +3,14 @@ VERSION=`git describe --tags --abbrev=0`
 
 all: build
 
-build: *.go MANIFEST.in
-	#go mod init
-	#go get github.com/tdewolff/minify/v2@${VERSION}
+compile:
+	# called from workflow
 	sed -i.bak -e "s/\{VERSION\}/${VERSION}/" setup.py
 	go build -buildmode=c-shared -o src/minify/minify.so
+
+build: compile
+	#go mod init
+	#go get github.com/tdewolff/minify/v2@${VERSION}
 	python -m build --sdist
 
 publish: clean build
@@ -18,5 +21,5 @@ clean:
 	rm -rf tdewolff_minify.egg-info
 	rm -rf go.*
 
-.PHONY: all build publish clean
+.PHONY: all compile build publish clean