update buf config (#4)

* update buf config

* remove googleapis submodule

.github/workflows/protobuf.yaml

@@ -16,8 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: 'true'
       - name: Run protogen
         run: make proto
       - name: Check Protobuf descriptor generation

.gitignore

@@ -1,2 +1,2 @@
-_proto/**
+api/_proto/**
 .idea/**

api/buf.lock

@@ -0,0 +1,8 @@
+# Generated by buf. DO NOT EDIT.
+version: v1
+deps:
+  - remote: buf.build
+    owner: googleapis
+    repository: googleapis
+    commit: 28151c0d0a1641bf938a7672c500e01d
+    digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de

api/buf.yaml

@@ -0,0 +1,13 @@
+version: v1
+name: buf.build/indent/multiparty
+
+deps:
+  - buf.build/googleapis/googleapis:28151c0d0a1641bf938a7672c500e01d
+
+breaking:
+  use:
+    - FILE
+
+lint:
+  use:
+    - DEFAULT

api/multiparty/v1/buf.gen.yaml

@@ -4,4 +4,4 @@ plugins:
   - plugin: go
     opt:
       - paths=source_relative
-    out: api
+    out: .

proto.mk

@@ -1,22 +1,27 @@
-GET="./scripts/get.sh"
+.PHONY: proto
 
-PROTO=_proto
-BUF := PATH=$(PROTO):$(PROTO)/protoc/bin:$$PATH $(PROTO)/buf
+API=api
+PROTO=api/_proto
+GET=./scripts/get.sh
+BUF := cd $(API) && PATH=$(notdir $(PROTO)):$(notdir $(PROTO))/protoc/bin:$$PATH buf
 
-proto: api/multiparty/v1/buf.gen.yaml \
+PKGS := \
+	multiparty/v1
+
+proto: $(PKGS)
+
+$(PKGS): proto-deps
+	$(BUF) generate --path $@ --template $@/buf.gen.yaml
+	$(BUF) build . --path $@ --as-file-descriptor-set -o $@/$(notdir $@).descriptor.pb
+
+proto-deps: \
  $(PROTO)/buf \
- $(PROTO)/googleapis \
  $(PROTO)/protoc/bin/protoc \
  $(PROTO)/protoc-gen-go
-	$(BUF) generate --path api/multiparty/v1 --template $<
-	$(BUF) build . --path api/multiparty/v1 --as-file-descriptor-set -o api/multiparty/v1/v1.descriptor.pb
 
 $(PROTO)/buf:
 	@$(GET) buf
 
-$(PROTO)/googleapis:
-	@git submodule update --quiet --depth=1 --init $@ >/dev/null 2>&1
-
 $(PROTO)/protoc/bin/protoc:
 	@$(GET) protoc
 

scripts/get.sh

@@ -20,7 +20,7 @@
 set -euo pipefail
 
 SUMS="$(dirname "$(readlink -f "$0")")/get.sha256"
-OUTDIR="$(dirname "$(readlink -f "$0")")/../_proto"
+OUTDIR="$(dirname "$(readlink -f "$0")")/../api/_proto"
 
 # write to temp file and cleanup later
 tmpDir="$(mktemp -d)"