ui: require yarn >= 1.7.0 #27262

tbg · 2018-07-08T19:21:04Z

Builds before the upgrade failed mysteriously.
@benesch (cc) suspects a bug in older versions of yarn.

$ make build
Running make with -j8
GOPATH set to /Users/tschottdorf/go
build/node-run.sh -C pkg/ui yarn install --offline
(echo "// Code generated by goyacc. DO NOT EDIT."; \
     echo "// GENERATED FILE DO NOT EDIT"; \
     cat pkg/sql/parser/gen/sql.go.tmp | \
     sed -E 's/^const ([A-Z][_A-Z0-9]*) =.*$/const \1 = lex.\1/g') > pkg/sql/parser/sql.go.tmp || rm pkg/sql/parser/sql.go.tmp
(echo "// Code generated by make. DO NOT EDIT."; \
     echo "// GENERATED FILE DO NOT EDIT"; \
     echo; \
     echo "package lex"; \
     echo; \
     grep '^const [A-Z][_A-Z0-9]* ' pkg/sql/parser/gen/sql.go.tmp) > pkg/sql/lex/tokens.go.tmp || rm pkg/sql/lex/tokens.go.tmp
mv -f pkg/sql/lex/tokens.go.tmp pkg/sql/lex/tokens.go
mv -f pkg/sql/parser/sql.go.tmp pkg/sql/parser/sql.go
yarn install v1.6.0
(node:50064) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead.
[1/5] Validating package.json...
go install -v docgen
bin/prereqs ./pkg/cmd/docgen > bin/docgen.d.tmp
[2/5] Resolving packages...
mv -f bin/docgen.d.tmp bin/docgen.d
[3/5] Fetching packages...
build/node-run.sh pkg/ui/bin/gen-protobuf-cli-deps.js > pkg/ui/node_modules/protobufjs/cli/package.json
bash: pkg/ui/node_modules/protobufjs/cli/package.json: No such file or directory
make: *** [pkg/ui/yarn.installed] Error 1
make: *** Waiting for unfinished jobs....

Release note (general change): the build now requires yarn at version
1.7.0 or above, to work around yarnpkg/yarn#5761.

cockroach-teamcity · 2018-07-08T19:21:10Z

This change is

benesch · 2018-07-08T19:32:33Z

LGTM! I think this deserves a shoutout on the mailing list though. (Feel free to leave that for me if you’d prefer. I can do it when I get home tonight EST.)

…

On Sun, Jul 8, 2018 at 3:21 PM cockroach-teamcity ***@***.***> wrote: This change is [image: Reviewable] <https://reviewable.io/reviews/cockroachdb/cockroach/27262> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#27262 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AA15IGjM7BMK_wzGVmJ8TwrgxQVh8OXIks5uEluzgaJpZM4VG1rT> .

tbg · 2018-07-08T20:36:01Z

I think we also need to build a new builder image -- at least all of CI is red because of the version bump. I won't get to this tonight, so do with this PR what you please!

benesch · 2018-07-08T20:43:23Z

Yeah there’s a new version of Yarn shipping with the updated builder in #27115, so we can just wait for that to land.

…

On Sun, Jul 8, 2018 at 4:36 PM Tobias Schottdorf ***@***.***> wrote: I think we also need to build a new builder image -- at least all of CI is red because of the version bump. I won't get to this tonight, so do with this PR what you please! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#27262 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AA15ICzpvOv6MsTUTw4QuwfdHmbImPLrks5uEm1BgaJpZM4VG1rT> .

couchand · 2018-07-09T14:30:05Z

LGTM pending the builder and mailing list updates. Thanks fellas!

tbg · 2018-07-10T19:38:49Z

Sent an update to the mailing list and will bors it when teamcity looks happy.

vilterp · 2018-07-10T20:28:09Z

Thanks Tobi, mind tacking on this patch?

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1b961596c..f791f3cae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ new engineers.
      - GNU Make (3.81+ is known to work)
      - CMake 3.1+
      - Autoconf 2.68+
-     - NodeJS 6.x and Yarn 1.0+
+     - NodeJS 6.x and Yarn 1.7+
 
    Note that at least 4GB of RAM is required to build from source and run tests.
 
diff --git a/pkg/ui/README.md b/pkg/ui/README.md
index a33cb71c1..23c978ebe 100644
--- a/pkg/ui/README.md
+++ b/pkg/ui/README.md
@@ -16,7 +16,7 @@ you'll be able to access the UI at <http://localhost:8080>.
 Our UI is compiled using a collection of tools that depends on
 [Node.js](https://nodejs.org/) and are managed with
 [Yarn](https://yarnpkg.com), a package manager that offers more deterministic
-package installation than NPM. NodeJS 6.x and Yarn 0.22.0 are known to work.
+package installation than NPM. NodeJS 6.x and Yarn 1.7.0 are known to work.
 [Chrome](https://www.google.com/chrome/), Google's internet browser. Unit tests
 are run using Chrome's "Headless" mode.

Also @benesch are the versions of Node and Yarn actually pinned in the Dockerfile? I just see this

cockroach/build/builder/Dockerfile

Line 194 in 38899a8

yarn \

so how do you know that we'll get 1.7.0?

@benesch

Builds before the upgrade failed mysteriously. @benesch (cc) suspects a bug in older versions of yarn. ``` $ make build Running make with -j8 GOPATH set to /Users/tschottdorf/go build/node-run.sh -C pkg/ui yarn install --offline (echo "// Code generated by goyacc. DO NOT EDIT."; \ echo "// GENERATED FILE DO NOT EDIT"; \ cat pkg/sql/parser/gen/sql.go.tmp | \ sed -E 's/^const ([A-Z][_A-Z0-9]*) =.*$/const \1 = lex.\1/g') > pkg/sql/parser/sql.go.tmp || rm pkg/sql/parser/sql.go.tmp (echo "// Code generated by make. DO NOT EDIT."; \ echo "// GENERATED FILE DO NOT EDIT"; \ echo; \ echo "package lex"; \ echo; \ grep '^const [A-Z][_A-Z0-9]* ' pkg/sql/parser/gen/sql.go.tmp) > pkg/sql/lex/tokens.go.tmp || rm pkg/sql/lex/tokens.go.tmp mv -f pkg/sql/lex/tokens.go.tmp pkg/sql/lex/tokens.go mv -f pkg/sql/parser/sql.go.tmp pkg/sql/parser/sql.go yarn install v1.6.0 (node:50064) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead. [1/5] Validating package.json... go install -v docgen bin/prereqs ./pkg/cmd/docgen > bin/docgen.d.tmp [2/5] Resolving packages... mv -f bin/docgen.d.tmp bin/docgen.d [3/5] Fetching packages... build/node-run.sh pkg/ui/bin/gen-protobuf-cli-deps.js > pkg/ui/node_modules/protobufjs/cli/package.json bash: pkg/ui/node_modules/protobufjs/cli/package.json: No such file or directory make: *** [pkg/ui/yarn.installed] Error 1 make: *** Waiting for unfinished jobs.... ``` Release note (general change): the build now requires yarn at version 1.7.0 or above.

tbg · 2018-07-10T20:30:54Z

Done.

benesch · 2018-07-10T20:39:14Z

The version of Node is pinned by Ubuntu, but Yarn is not. We get whatever the latest version of Yarn is at the time the builder image is built. This works well enough since we don't enforce a maximum version of Yarn.

tbg · 2018-07-10T21:07:12Z

bors r=benesch,vilterp

@benesch

27262: ui: require yarn >= 1.7.0 r=benesch,vilterp a=tschottdorf Builds before the upgrade failed mysteriously. @benesch (cc) suspects a bug in older versions of yarn. ``` $ make build Running make with -j8 GOPATH set to /Users/tschottdorf/go build/node-run.sh -C pkg/ui yarn install --offline (echo "// Code generated by goyacc. DO NOT EDIT."; \ echo "// GENERATED FILE DO NOT EDIT"; \ cat pkg/sql/parser/gen/sql.go.tmp | \ sed -E 's/^const ([A-Z][_A-Z0-9]*) =.*$/const \1 = lex.\1/g') > pkg/sql/parser/sql.go.tmp || rm pkg/sql/parser/sql.go.tmp (echo "// Code generated by make. DO NOT EDIT."; \ echo "// GENERATED FILE DO NOT EDIT"; \ echo; \ echo "package lex"; \ echo; \ grep '^const [A-Z][_A-Z0-9]* ' pkg/sql/parser/gen/sql.go.tmp) > pkg/sql/lex/tokens.go.tmp || rm pkg/sql/lex/tokens.go.tmp mv -f pkg/sql/lex/tokens.go.tmp pkg/sql/lex/tokens.go mv -f pkg/sql/parser/sql.go.tmp pkg/sql/parser/sql.go yarn install v1.6.0 (node:50064) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead. [1/5] Validating package.json... go install -v docgen bin/prereqs ./pkg/cmd/docgen > bin/docgen.d.tmp [2/5] Resolving packages... mv -f bin/docgen.d.tmp bin/docgen.d [3/5] Fetching packages... build/node-run.sh pkg/ui/bin/gen-protobuf-cli-deps.js > pkg/ui/node_modules/protobufjs/cli/package.json bash: pkg/ui/node_modules/protobufjs/cli/package.json: No such file or directory make: *** [pkg/ui/yarn.installed] Error 1 make: *** Waiting for unfinished jobs.... ``` Release note (general change): the build now requires yarn at version 1.7.0 or above, to work around yarnpkg/yarn#5761. 27307: storage: return TransactionRetryError from QueryIntent on pushed intent r=nvanbenschoten a=nvanbenschoten Extracted from #26599. This change adjusts how QueryIntent handles pushed intents. First, it changes how pushed intents interact with SNAPSHOT transactions. Next, it makes sure to update the response transaction in the case of pushed intents. Finally, it returns a RETRY_SERIALIZABLE TransactionRetryError for SERIALIZABLE transactions who observe a pushed intent with the RETURN_ERROR behavior. Release note: None 27329: log: use fake stacktrace when test-exiting r=benesch a=tschottdorf Having stack traces littered across tests has been a long-standing pet peeve of mine (and presumably others). We search through logs more often than we would like to admit, and having to skip a number of intentional stack traces is annoying. Make it so that whenever the logging exit func is mocked, the stack trace indicates that. Release note: None 27348: engine: fix RocksDBBatchReader example comment r=nvanbenschoten a=nvanbenschoten Release note: None Co-authored-by: Tobias Schottdorf <[email protected]> Co-authored-by: Nathan VanBenschoten <[email protected]>

craig · 2018-07-10T21:30:04Z

Build succeeded

GitHub CI (Cockroach)

tbg requested a review from a team July 8, 2018 19:21

tbg force-pushed the fix/yarn-bump branch from 8cedcaf to 3175003 Compare July 10, 2018 19:34

vilterp mentioned this pull request Jul 10, 2018

ui: readme: update known-to-work yarn and node versions #25288

Closed

tbg force-pushed the fix/yarn-bump branch from 3175003 to 013febe Compare July 10, 2018 20:30

craig bot merged commit 013febe into cockroachdb:master Jul 10, 2018

tbg deleted the fix/yarn-bump branch July 26, 2018 09:49

jseldess mentioned this pull request Jul 31, 2018

ui: require yarn >= 1.7.0 cockroachdb/docs#3444

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ui: require yarn >= 1.7.0 #27262

ui: require yarn >= 1.7.0 #27262

tbg commented Jul 8, 2018 •

edited

Loading

cockroach-teamcity commented Jul 8, 2018

benesch commented Jul 8, 2018 via email

tbg commented Jul 8, 2018

benesch commented Jul 8, 2018 via email

couchand commented Jul 9, 2018

tbg commented Jul 10, 2018

vilterp commented Jul 10, 2018 •

edited

Loading

tbg commented Jul 10, 2018

benesch commented Jul 10, 2018

tbg commented Jul 10, 2018

craig bot commented Jul 10, 2018

ui: require yarn >= 1.7.0 #27262

ui: require yarn >= 1.7.0 #27262

Conversation

tbg commented Jul 8, 2018 • edited Loading

cockroach-teamcity commented Jul 8, 2018

benesch commented Jul 8, 2018 via email

tbg commented Jul 8, 2018

benesch commented Jul 8, 2018 via email

couchand commented Jul 9, 2018

tbg commented Jul 10, 2018

vilterp commented Jul 10, 2018 • edited Loading

tbg commented Jul 10, 2018

benesch commented Jul 10, 2018

tbg commented Jul 10, 2018

craig bot commented Jul 10, 2018

Build succeeded

tbg commented Jul 8, 2018 •

edited

Loading

vilterp commented Jul 10, 2018 •

edited

Loading