playground: v.io/x/devtools: start to use profile-v23
Switch jiri test and hence all checked in
references to use jiri profile vs jiri v23-profile.
MultiPart: 11/16
Change-Id: I2eb55012c05a3e0accad4862740c57b8240c8554
diff --git a/client/Makefile b/client/Makefile
index c68a77d..ab71bab 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,4 +1,4 @@
-NODE_DIR := $(shell jiri v23-profile list --info Target.InstallationDir nodejs)
+NODE_DIR := $(shell jiri profile list --info Target.InstallationDir v23:nodejs)
PATH := bin:node_modules/.bin:$(PATH):$(NODE_DIR)/bin
SHELL := /bin/bash -euo pipefail
diff --git a/go/src/v.io/x/playground/Dockerfile b/go/src/v.io/x/playground/Dockerfile
index d8de31a..bf99bc4 100644
--- a/go/src/v.io/x/playground/Dockerfile
+++ b/go/src/v.io/x/playground/Dockerfile
@@ -26,7 +26,7 @@
RUN curl https://v.io/bootstrap | bash
# Setup Vanadium profiles.
-RUN jiri v23-profile install base
+RUN jiri profile install v23:base
# Install the release/javascript/core library.
# TODO(nlacasse): Switch to "npm install -g vanadium" once release/javascript/core
diff --git a/go/src/v.io/x/playground/builder/main.go b/go/src/v.io/x/playground/builder/main.go
index 375b057..27acee0 100644
--- a/go/src/v.io/x/playground/builder/main.go
+++ b/go/src/v.io/x/playground/builder/main.go
@@ -44,7 +44,7 @@
var (
verbose = flag.Bool("verbose", true, "Whether to output debug messages.")
includeServiceOutput = flag.Bool("includeServiceOutput", false, "Whether to stream service (mounttable, wspr, proxy) output to clients.")
- includeProfileEnv = flag.Bool("includeProfileEnv", false, "Whether to log the output of \"jiri v23-profile env\" before compilation.")
+ includeProfileEnv = flag.Bool("includeProfileEnv", false, "Whether to log the output of \"jiri profile env\" before compilation.")
// TODO(ivanpi): Separate out mounttable, proxy, wspr timeouts. Add compile timeout. Revise default.
runTimeout = flag.Duration("runTimeout", 5*time.Second, "Time limit for running user code.")
@@ -102,7 +102,7 @@
func logProfileEnv() error {
if *includeProfileEnv {
- return makeCmd("<environment>", false, "", "jiri", "v23-profile", "env").Run()
+ return makeCmd("<environment>", false, "", "jiri", "profile", "env").Run()
}
return nil
}
