From 608a1e6a728f94ec8dd36dfc53e24a65a4e69a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacio=20G=C3=B3mez?= Date: Tue, 23 May 2023 23:07:54 -0300 Subject: [PATCH] Fix binary builds by disabling buildcvs. --- .github/workflows/release-build.yml | 2 ++ .github/workflows/scripts/build.sh | 8 ++++---- Makefile | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 44030dc..7e525e4 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -8,6 +8,8 @@ env: jobs: build: runs-on: ubuntu-latest + permissions: + contents: write steps: - name: download mosquitto run: | diff --git a/.github/workflows/scripts/build.sh b/.github/workflows/scripts/build.sh index 92e1a24..92d8bae 100755 --- a/.github/workflows/scripts/build.sh +++ b/.github/workflows/scripts/build.sh @@ -7,7 +7,7 @@ cp *.h /usr/include cd /usr/src/mosquitto-go-auth #build amd64 Linux -make +make without-vcs cp go-auth.so pw /usr/src/output/linux-amd64 # build arm64 Linux @@ -15,7 +15,7 @@ make clean export CGO_ENABLED=1 export GOARCH=arm64 export CC=aarch64-linux-gnu-gcc -make +make without-vcs cp go-auth.so pw /usr/src/output/linux-arm64 # build armv7 Linux @@ -24,7 +24,7 @@ export CGO_ENABLED=1 export GOARCH=arm export GOARM=7 export CC=arm-linux-gnueabi-gcc -make +make without-vcs cp go-auth.so pw /usr/src/output/linux-armv7 # build armv7 Linux @@ -33,5 +33,5 @@ export CGO_ENABLED=1 export GOARCH=arm export GOARM=6 export CC=arm-linux-gnueabi-gcc -make +make without-vcs cp go-auth.so pw /usr/src/output/linux-armv6 diff --git a/Makefile b/Makefile index fc0f305..ed8da1b 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,12 @@ all: env CGO_LDFLAGS="$(LDFLAGS)" go build -buildmode=c-shared -o go-auth.so go build pw-gen/pw.go +without-vcs: + @echo "Bulding for $(UNAME_S)" + env CGO_CFLAGS="$(CFLAGS)" go build -buildvcs=false -buildmode=c-archive go-auth.go + env CGO_LDFLAGS="$(LDFLAGS)" go build -buildvcs=false -buildmode=c-shared -o go-auth.so + go build -buildvcs=false pw-gen/pw.go + test: cd plugin && make go test ./backends ./cache ./hashing -v -count=1