Skip to content

Commit

Permalink
Multiple changes.
Browse files Browse the repository at this point in the history
* Update grpcio-tools to 1.29.0.
* Update Node.js dependency to 12.18.0.
* Update protobuf to 3.12.2.
  • Loading branch information
mol123 committed Jun 16, 2020
1 parent 94f6f3a commit b4b07de
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN pip3 install --upgrade setuptools && \
python3 -m venv --system-site-packages $GRR_VENV

RUN $GRR_VENV/bin/pip install --upgrade --no-cache-dir pip wheel six setuptools nodeenv && \
$GRR_VENV/bin/nodeenv -p --prebuilt --node=12.11.1 && \
$GRR_VENV/bin/nodeenv -p --prebuilt --node=12.18.0 && \
echo '{ "allow_root": true }' > /root/.bowerrc

# Copy the GRR code over.
Expand Down
4 changes: 2 additions & 2 deletions grr/proto/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
THIS_DIRECTORY = os.path.dirname(os.path.realpath(__file__))
os.chdir(THIS_DIRECTORY)

GRPCIO_TOOLS = "grpcio-tools==1.24.1"
PROTOBUF = "protobuf==3.11.1"
GRPCIO_TOOLS = "grpcio-tools==1.29.0"
PROTOBUF = "protobuf==3.12.2"


def get_config():
Expand Down
2 changes: 1 addition & 1 deletion travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pip install --upgrade pip wheel six setuptools nodeenv

# Install the latest version of nodejs. Some packages
# may not be compatible with the version.
nodeenv -p --prebuilt --node=12.11.1
nodeenv -p --prebuilt --node=12.18.0

# Pull in changes to activate made by nodeenv
source "${HOME}/INSTALL/bin/activate"
Expand Down

0 comments on commit b4b07de

Please sign in to comment.