From aa4d76f6ea95c5cc41516495645082a1e659ce15 Mon Sep 17 00:00:00 2001
From: Vihang Mehta <vihang@pixielabs.ai>
Date: Wed, 28 Apr 2021 20:56:19 -0700
Subject: [PATCH] Use new lsif-tsc
Summary: This should work again.
Test Plan: Image builds.
Reviewers: zasgar, michelle
Reviewed By: michelle
Differential Revision: https://phab.corp.pixielabs.ai/D8462
GitOrigin-RevId: 27c59fd4a6edb879444e6753b2305e3f2c80b4b2
---
ci/collect_and_upload_lsif.sh | 7 +++----
docker.properties | 2 +-
tools/chef/base_image_version.txt | 2 +-
tools/chef/cookbooks/pixielabs/recipes/base.rb | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ci/collect_and_upload_lsif.sh b/ci/collect_and_upload_lsif.sh
index eaac31362..79b352efa 100755
--- a/ci/collect_and_upload_lsif.sh
+++ b/ci/collect_and_upload_lsif.sh
@@ -80,10 +80,9 @@ LSIF_GO_OUT="go.dump.lsif"
--output="${LSIF_GO_OUT}"
upload_to_sourcegraph "${LSIF_GO_OUT}"
-# Disabling TS LSIF upload until sourcegraph fix their fork of lsif-tsc.
-# LSIF_TS_OUT="ts.dump.lsif"
-# lsif-tsc --out "${LSIF_TS_OUT}" -p src/ui
-# upload_to_sourcegraph "${LSIF_TS_OUT}"
+LSIF_TS_OUT="ts.dump.lsif"
+lsif-tsc --out "${LSIF_TS_OUT}" -p src/ui
+upload_to_sourcegraph "${LSIF_TS_OUT}"
LSIF_CPP_OUT="cpp.dump.lsif"
mapfile -t < <(bazel query \
diff --git a/docker.properties b/docker.properties
index 2f3906aec..1720c987b 100644
--- a/docker.properties
+++ b/docker.properties
@@ -1 +1 @@
-DOCKER_IMAGE_TAG=202104281308
+DOCKER_IMAGE_TAG=202104282048
diff --git a/tools/chef/base_image_version.txt b/tools/chef/base_image_version.txt
index be7cecd63..e022c1968 100644
--- a/tools/chef/base_image_version.txt
+++ b/tools/chef/base_image_version.txt
@@ -1 +1 @@
-202104271249
+202104202203
diff --git a/tools/chef/cookbooks/pixielabs/recipes/base.rb b/tools/chef/cookbooks/pixielabs/recipes/base.rb
index c9f632311..1aef78699 100644
--- a/tools/chef/cookbooks/pixielabs/recipes/base.rb
+++ b/tools/chef/cookbooks/pixielabs/recipes/base.rb
@@ -38,7 +38,7 @@ include_recipe 'pixielabs::golang'
execute 'install node packages' do
command %(/opt/node/bin/npm install -g \
tslint@5.11.0 typescript@3.0.1 yarn@1.22.4 webpack@4.42.0 \
- jshint@2.11.0 jest@23.4.2 lsif-tsc@0.5.6)
+ jshint@2.11.0 jest@23.4.2 @sourcegraph/lsif-tsc@0.6.8)
end
directory '/opt/pixielabs' do
--
GitLab