Labeling & libs update

proofrock · May 5, 2024 · 986e035 · 986e035
1 parent 66c3cc9
commit 986e035
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -7,6 +7,7 @@ build-prepare:
 cleanup:
 	- rm -r bin
 	- rm src/ws4sql
+	- ls github.com && sudo rm -rf github.com # xgo build dir
 
 upd-libraries:
 	cd src; go get -u
@@ -36,36 +37,36 @@ dist:
 	mv github.com/proofrock/ bin
 	rm -rf github.com/
 	mv bin/ws4sql-windows-10.0-amd64.exe bin/ws4sql.exe
-	cd bin/ && zip -9 ws4sql-v0.17.0beta1-win-x86_64.zip ws4sql.exe
+	cd bin/ && zip -9 ws4sql-v0.17dev2-win-x86_64.zip ws4sql.exe
 	rm bin/ws4sql.exe
 	mv bin/ws4sql-darwin-10.12-amd64 bin/ws4sql
-	cd bin/ && zip -9 ws4sql-v0.17.0beta1-darwin-x86_64.zip ws4sql
+	cd bin/ && zip -9 ws4sql-v0.17dev2-darwin-x86_64.zip ws4sql
 	mv bin/ws4sql-darwin-10.12-arm64 bin/ws4sql
-	cd bin/ && zip -9 ws4sql-v0.17.0beta1-darwin-arm64.zip ws4sql
+	cd bin/ && zip -9 ws4sql-v0.17dev2-darwin-arm64.zip ws4sql
 	mv bin/ws4sql-linux-amd64 bin/ws4sql
-	cd bin/ && bash -c "tar c ws4sql | gzip -9 > ws4sql-v0.17.0beta1-linux-x86_64.tar.gz"
+	cd bin/ && bash -c "tar c ws4sql | gzip -9 > ws4sql-v0.17dev2-linux-x86_64.tar.gz"
 	mv bin/ws4sql-linux-arm64 bin/ws4sql
-	cd bin/ && bash -c "tar c ws4sql | gzip -9 > ws4sql-v0.17.0beta1-linux-arm64.tar.gz"
+	cd bin/ && bash -c "tar c ws4sql | gzip -9 > ws4sql-v0.17dev2-linux-arm64.tar.gz"
 	mv bin/ws4sql-linux-arm-6 bin/ws4sql
-	cd bin/ && bash -c "tar c ws4sql | gzip -9 > ws4sql-v0.17.0beta1-linux-arm-v6.tar.gz"
+	cd bin/ && bash -c "tar c ws4sql | gzip -9 > ws4sql-v0.17dev2-linux-arm-v6.tar.gz"
 	rm bin/ws4sql
 
 docker:
 	docker buildx build -f Dockerfile.x86_64 --no-cache -t local_ws4sql:latest .
 
 docker-multiarch:
 	docker run --privileged --rm tonistiigi/binfmt --install arm64,arm
-	docker buildx build -f Dockerfile.x86_64 --no-cache -t germanorizzo/ws4sql:v0.17.0beta1-amd64 .
-	docker buildx build -f Dockerfile.arm64 --no-cache --platform linux/arm64/v8 -t germanorizzo/ws4sql:v0.17.0beta1-arm64 .
+	docker buildx build -f Dockerfile.x86_64 --no-cache -t germanorizzo/ws4sql:v0.17dev2-amd64 .
+	docker buildx build -f Dockerfile.arm64 --no-cache --platform linux/arm64/v8 -t germanorizzo/ws4sql:v0.17dev2-arm64 .
 
 docker-publish:
 	make docker-multiarch
-	docker push germanorizzo/ws4sql:v0.17.0beta1-amd64
-	docker push germanorizzo/ws4sql:v0.17.0beta1-arm64
-	docker manifest create -a germanorizzo/ws4sql:v0.17.0beta1 germanorizzo/ws4sql:v0.17.0beta1-amd64 germanorizzo/ws4sql:v0.17.0beta1-arm64
-	docker manifest push germanorizzo/ws4sql:v0.17.0beta1
+	docker push germanorizzo/ws4sql:v0.17dev2-amd64
+	docker push germanorizzo/ws4sql:v0.17dev2-arm64
+	docker manifest create -a germanorizzo/ws4sql:v0.17dev2 germanorizzo/ws4sql:v0.17dev2-amd64 germanorizzo/ws4sql:v0.17dev2-arm64
+	docker manifest push germanorizzo/ws4sql:v0.17dev2
 	- docker manifest rm germanorizzo/ws4sql:latest
-	docker manifest create germanorizzo/ws4sql:latest germanorizzo/ws4sql:v0.17.0beta1-amd64 germanorizzo/ws4sql:v0.17.0beta1-arm64
+	docker manifest create germanorizzo/ws4sql:latest germanorizzo/ws4sql:v0.17dev2-amd64 germanorizzo/ws4sql:v0.17dev2-arm64
 	docker manifest push germanorizzo/ws4sql:latest
 
 docker-devel:

diff --git a/src/go.mod b/src/go.mod
@@ -25,6 +25,6 @@ require (
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.52.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
diff --git a/src/go.sum b/src/go.sum
@@ -53,8 +53,8 @@ github.com/wI2L/jettison v0.7.4 h1:ptjriu75R/k5RAZO0DJzy2t55f7g+dPiBxBY38icaKg=
 github.com/wI2L/jettison v0.7.4/go.mod h1:O+F+T7X7ZN6kTsd167Qk4aZMC8jNrH48SMedNmkfPb0=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

diff --git a/src/ws4sql.go b/src/ws4sql.go
@@ -35,7 +35,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 )
 
-const version = "v0.17.0beta1"
+const version = "ws4sql-v0.17dev2"
 
 func getSQLiteVersion() (string, error) {
 	dbObj, err := sql.Open("sqlite3", ":memory:")