Skip to content

Commit

Permalink
Revert "CI should check that generated code has been committed (impro…
Browse files Browse the repository at this point in the history
…bable-eng#127)"

This reverts commit f60b1b5.
  • Loading branch information
chrisgervang authored Nov 16, 2018
1 parent cbed2c3 commit 0a45453
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
8 changes: 2 additions & 6 deletions generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@ PROTOC_VERSION="3.5.1"
echo "Downloading protoc v${PROTOC_VERSION} for ${platform}..."
mkdir -p protoc
if [[ $platform == 'Linux' ]]; then
PROTOC_URL="https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip"
curl -L https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip | tar xz -C protoc
elif [[ $platform == 'Mac' ]]; then
PROTOC_URL="https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-osx-x86_64.zip"
curl -L https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-osx-x86_64.zip | tar xz -C protoc
else
echo "Cannot download protoc. ${platform} is not currently supported by ts-protoc-gen"
exit 1
fi

wget ${PROTOC_URL} --output-document="protoc-${PROTOC_VERSION}.zip"
unzip "protoc-${PROTOC_VERSION}.zip" -d protoc
rm "protoc-${PROTOC_VERSION}.zip"

PROTOC=./protoc/bin/protoc

echo "Generating proto definitions..."
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions travis-ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,4 @@ set -ex

npm run lint
npm test

./generate.sh
MODIFIED_FILES=$(git diff --name-only)
if [[ -n $MODIFIED_FILES ]]; then
echo "ERROR: Changes detected in generated code, please run './generate.sh' and check-in the changes."
exit 1
fi

bazel build //...:all

0 comments on commit 0a45453

Please sign in to comment.