Unverified Commit 3efc3fd4 authored by Hao Nguyen's avatar Hao Nguyen Committed by GitHub

Upgrade the closure compiler version (#5955)

Also update Dockerfile for JavaScript. The old one is using an npm that is too outdated
parent 2350e20c
......@@ -137,7 +137,7 @@ function getClosureBuilderCommand(exportsFile, outputFile) {
return './node_modules/google-closure-library/closure/bin/build/closurebuilder.py ' +
'--root node_modules ' +
'-o compiled ' +
'--compiler_jar node_modules/google-closure-compiler/compiler.jar ' +
'--compiler_jar node_modules/google-closure-compiler-java/compiler.jar ' +
'-i ' + exportsFile + ' ' +
'map.js message.js binary/arith.js binary/constants.js binary/decoder.js ' +
'binary/encoder.js binary/reader.js binary/utils.js binary/writer.js ' +
......
......@@ -9,8 +9,8 @@
"dependencies": {},
"devDependencies": {
"glob": "~6.0.4",
"google-closure-compiler": "~20160619.0.0",
"google-closure-library": "~20160125.0.0",
"google-closure-compiler": "~20190301.0.0",
"google-closure-library": "~20190301.0.0",
"gulp": "~3.9.0",
"jasmine": "~2.4.1"
},
......
......@@ -4,7 +4,7 @@ set -ex
cd $(dirname $0)/../../..
git_root=$(pwd)
cd -
cd kokoro/linux/dockerfile
DOCKERHUB_ORGANIZATION=protobuftesting
......
FROM ubuntu:latest
RUN apt-get update && apt-get install -y gnupg
# Install dependencies. We start with the basic ones require to build protoc
# and the C++ build
RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
autoconf \
autotools-dev \
build-essential \
bzip2 \
ccache \
curl \
gcc \
git \
libc6 \
libc6-dbg \
libc6-dev \
libgtest-dev \
libtool \
make \
parallel \
time \
wget \
&& apt-get clean
##################
# Javascript dependencies.
RUN apt-get install -y \
# -- For javascript and closure compiler -- \
npm \
default-jre
......@@ -10,7 +10,8 @@
# Change to repo root
cd $(dirname $0)/../../..
export DOCKERFILE_DIR=kokoro/linux/64-bit
export DOCKERHUB_ORGANIZATION=protobuftesting
export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/javascript
export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
export OUTPUT_DIR=testoutput
export TEST_SET="javascript"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment