From 700d29c26e3adf71645293e3a220c67392a62b7f Mon Sep 17 00:00:00 2001 From: jamesread Date: Tue, 25 May 2021 14:04:52 +0100 Subject: [PATCH] Will use goreleaser instead of make targets going forward --- Makefile | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 888af64..7746d94 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,6 @@ daemon-unittests: grpc: protoc -I.:$(GOPATH)/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/ --go_out=. --go-grpc_out=. --grpc-gateway_out=. OliveTin.proto -# protoc --go-grpc_out=grpc:gen/grpc/ OliveTin.proto -# protoc -I.:$(GOPATH)/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/ --grpc-gateway_out=gen/grpc --grpc-gateway_opt paths=source_relative OliveTin.proto podman-image: buildah bud -t olivetin @@ -33,7 +31,7 @@ podman-image: podman-container: podman kill olivetin podman rm olivetin - podman create --name olivetin -p 1337:1337 -p 1338:1338 -p 1339:1339 -v /etc/OliveTin/:/config:ro olivetin + podman create --name olivetin -p 1337:1337 -v /etc/OliveTin/:/config:ro olivetin podman start olivetin devrun: compile @@ -46,35 +44,4 @@ webui-codestyle: cd webui && eslint main.js js/* cd webui && stylelint style.css -release-common: - rm -rf webui/node_modules/ - rm -rf releases/ - mkdir -p releases/common/ - cp -r webui releases/common/ - cp -r var/config.yaml releases/common/ - cp OliveTin.service releases/common/ - cp README.md releases/common/ - cp Dockerfile releases/common/ - -release-bin-rpi: daemon-compile-armhf release-common - mkdir -p releases/rpi/ - cd releases/common && cp -r * ../rpi/ - cp OliveTin.armhf releases/rpi/OliveTin - cd releases/rpi && tar cavf "../OliveTin-armhf-`date +'%Y-%m-%d'`.`git rev-parse --short HEAD`.tgz" . - -release-bin-x64-lin: daemon-compile-x64-lin release-common - mkdir -p releases/x64-lin/ - cd releases/common && cp -r * ../x64-lin/ - cp OliveTin releases/x64-lin/ - cd releases/x64-lin && tar cavf "../OliveTin-x64-linux-`date +'%Y-%m-%d'`.`git rev-parse --short HEAD`.tgz" . - -release-bin-x64-win: daemon-compile-x64-win release-common - mkdir -p releases/x64-win/ - cd releases/common && cp -r * ../x64-win/ - cp OliveTin.exe releases/x64-win/ - cd releases/x64-lin && zip -r "../OliveTin-x64-windows-`date +'%Y-%m-%d'`.`git rev-parse --short HEAD`.zip" . - -releases: release-bin-rpi release-bin-x64-lin release-bin-x64-win - - -.PHONY: grpc release-common +.PHONY: grpc