Skip to content

Commit 8cccc0d

Browse files
authored
Merge pull request #10606 from deannagarcia/buildZip19
Use local protoc artifacts
2 parents 9e8d5f1 + 0661cc4 commit 8cccc0d

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

protoc-artifacts/build-zip.sh

+5-10
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Example:
1010
$ $0 protoc 3.0.0
1111
$ $0 protoc-gen-javalite 3.0.0
1212
13-
This script will download pre-built protoc or protoc plugin binaries from maven
14-
repository and create .zip packages suitable to be included in the github
15-
release page. If the target is protoc, well-known type .proto files will also be
16-
included. Each invocation will create 8 zip packages:
13+
This script will create .zip packages suitable to be included in the github
14+
release page. It requires all protoc executables to be present in the
15+
protoc-artifacts/ directory. If the target is protoc, well-known type .proto
16+
files will also be included. Each invocation will create 8 zip packages:
1717
dist/<TARGET>-<VERSION_NUMBER>-win32.zip
1818
dist/<TARGET>-<VERSION_NUMBER>-win64.zip
1919
dist/<TARGET>-<VERSION_NUMBER>-osx-x86_64.zip
@@ -98,12 +98,7 @@ for((i=0;i<${#FILE_NAMES[@]};i+=2));do
9898
BINARY="$TARGET"
9999
fi
100100
BINARY_NAME=${FILE_NAMES[$(($i+1))]}
101-
BINARY_URL=https://repo1.maven.org/maven2/com/google/protobuf/$TARGET/${VERSION_NUMBER}/$TARGET-${VERSION_NUMBER}-${BINARY_NAME}
102-
if ! wget ${BINARY_URL} -O ${DIR}/bin/$BINARY &> /dev/null; then
103-
echo "[ERROR] Failed to download ${BINARY_URL}" >&2
104-
echo "[ERROR] Skipped $TARGET-${VERSION_NAME}-${ZIP_NAME}" >&2
105-
continue
106-
fi
101+
cp $BINARY_NAME ${DIR}/bin/$BINARY
107102
TARGET_ZIP_FILE=`pwd`/dist/$TARGET-${VERSION_NUMBER}-${ZIP_NAME}
108103
pushd $DIR &> /dev/null
109104
chmod +x bin/$BINARY

0 commit comments

Comments
 (0)