From 64d3385291b5d5f7c685e5e12321cc37603f4a6b Mon Sep 17 00:00:00 2001 From: RyanSquared Date: Fri, 5 May 2023 07:18:28 -0400 Subject: [PATCH] Makefile: add sops --- Makefile | 16 ++++++++++++++++ config/global.env | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b089cc..5f891c4 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,7 @@ $(OUT_DIR)/terraform: $(FETCH_DIR)/terraform -o /home/build/$@ \ ") +<<<<<<< HEAD $(OUT_DIR)/sops: $(FETCH_DIR)/sops $(call toolchain," \ cd $(FETCH_DIR)/sops && \ @@ -113,10 +114,25 @@ $(OUT_DIR)/sops: $(FETCH_DIR)/sops export GOCACHE=/home/build/$(CACHE_DIR) && \ export GOPATH=/home/build/$(CACHE_DIR) && \ export CGO_ENABLED=0 && \ +======= +$(FETCH_DIR)/sops: + $(call git_clone,$@,$(SOPS_REPO),$(SOPS_REF)) + +$(OUT_DIR)/sops: $(FETCH_DIR)/sops + $(call toolchain," \ + cd $(FETCH_DIR)/sops && \ + export CGO_ENABLED=0 && \ + export GOCACHE=/home/build/$(CACHE_DIR) && \ + export GOPATH=/home/build/$(CACHE_DIR) && \ +>>>>>>> c8a6313 (Makefile: add sops) go build \ -v \ -trimpath \ -ldflags='-w -extldflags=-static' \ +<<<<<<< HEAD -o /home/build/$@ \ go.mozilla.org/sops/v3/cmd/sops \ +======= + -o /home/build/$@ $(SOPS_PKG) \ +>>>>>>> c8a6313 (Makefile: add sops) ") diff --git a/config/global.env b/config/global.env index a93177a..7f29ce3 100644 --- a/config/global.env +++ b/config/global.env @@ -1,5 +1,6 @@ DEBIAN_HASH=f9e970d357981f7f5055f89365af980534ce742fc11480c51f929da83aa15980 TERRAFORM_REF=db6079cfe269803701be9e1a89aeaf9a93714e86 TERRAFORM_REPO=https://github.com/hashicorp/terraform -SOPS_REF=e1edc059487ddd14236dfe47267b05052f6c20b4 +SOPS_REF=86f500de6102f5219e3fd0a25c718db01a7d39ed SOPS_REPO=https://github.com/mozilla/sops +SOPS_PKG=go.mozilla.org/sops/v3/cmd/sops