Skip to content

Commit fbfa3e0

Browse files
Fix WKT generation
Because of bufbuild/makego#281, we're now dealing with a symlink; update the handling to match. Still not quite right as we're manually updating the PROTOC_VERSION here to match what we already have in this repo, overriding makego's managed version. We should get in bufbuild/makego#295.
1 parent 0affb9e commit fbfa3e0

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

make/buf/all.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ include make/go/buf.mk
7474
installtest:: $(PROTOC) $(PROTOC_GEN_GO)
7575

7676
.PHONY: godata
77-
godata: installwkt-go-data installbuf-legacyfederation-go-data $(PROTOC)
77+
godata: installwkt-go-data installbuf-legacyfederation-go-data $(PROTOC) $(PROTOC_INCLUDE)
7878
rm -rf private/gen/data/datawkt
7979
mkdir -p private/gen/data/datawkt
8080
wkt-go-data "$(CACHE_INCLUDE)" --package datawkt --protobuf-version "$(PROTOC_VERSION)" > private/gen/data/datawkt/datawkt.gen.go

make/go/dep_protoc.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ $(call _assert_var,CACHE_INCLUDE)
1010
$(call _assert_var,CACHE_BIN)
1111

1212
# Settable
13-
# https://github.com/protocolbuffers/protobuf/releases 20250528 checked 20250603
13+
# https://github.com/protocolbuffers/protobuf/releases 20250225 checked 20250310
1414
# NOTE: Set to version compatible with genproto source code (only used in tests).
15-
PROTOC_VERSION ?= 31.1
15+
PROTOC_VERSION ?= 33.3
1616

1717
# Google adds a dash to release candidate versions in the name of the
1818
# release artifact, i.e. v27.0-rc1 -> v27.0-rc-1

private/buf/bufwkt/cmd/wkt-go-data/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func run(ctx context.Context, container appext.Container, flags *flags) error {
106106
if protobufVersion == "" {
107107
return appcmd.NewInvalidArgumentErrorf("--%s is required", protobufVersionFlagName)
108108
}
109-
readWriteBucket, err := storageos.NewProvider(storageos.ProviderWithSymlinks()).NewReadWriteBucket(dirPath)
109+
readWriteBucket, err := storageos.NewProvider(storageos.ProviderWithSymlinks()).NewReadWriteBucket(dirPath, storageos.ReadWriteBucketWithSymlinksIfSupported())
110110
if err != nil {
111111
return err
112112
}

0 commit comments

Comments
 (0)