Skip to content

Commit

Permalink
Fix update upstream workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
anuraaga committed Apr 5, 2024
1 parent 4accce1 commit 7583e77
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion buildtools/wasm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y binaryen git patch
# Easiest way to build grpc-java plugin is add it to the protoc build
ADD buildtools/wasm/version.txt /version.txt
RUN git clone --recursive https://github.com/grpc/grpc-java.git --branch $(cat /version.txt | awk '{$1=$1};1') /grpcjava
RUN git clone --recursive https://github.com/protocolbuffers/protobuf.git --branch v25.2 /workspace
RUN git clone --recursive https://github.com/protocolbuffers/protobuf.git --branch v26.1 /workspace
RUN cp -R /grpcjava/compiler/src/java_plugin/cpp /workspace/src/grpcjava
RUN echo "set(protoc-gen-grpc-java_files \${protobuf_SOURCE_DIR}/src/grpcjava/java_plugin.cpp \${protobuf_SOURCE_DIR}/src/grpcjava/java_generator.cpp) \n\
add_executable(protoc-gen-grpc-java \${protoc-gen-grpc-java_files} \${protobuf_version_rc_file}) \n\
Expand Down
2 changes: 1 addition & 1 deletion buildtools/wasm/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.61.0
v1.62.2
3 changes: 2 additions & 1 deletion magefiles/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
)

func init() {
magefiles.SetLibraryName("protoc")
magefiles.SetLibraryName("protoc-gen-grpc-java")
magefiles.SetLibraryRepo("grpc/grpc-java")
}

func Snapshot() error {
Expand Down

0 comments on commit 7583e77

Please sign in to comment.