Commit 41dcbed2 authored by Jérome Perrin's avatar Jérome Perrin

Theia 1.44.0

See merge request nexedi/slapos!1489
parents 66e5ac0b 2e329ff3
......@@ -47,12 +47,14 @@ pre-configure =
# To regenerate yarn.lock, comment the line below
cp yarn.lock %(location)s
# Workaround https://github.com/microsoft/vscode/issues/154048
# Once upstream is fixed:
# - remove [vscode-uri] section
# - remove the commands below
# - remove component/tar/buildout.cfg
# - remove the "resolution" field in package.json
# - regenerate yarn.lock
# This bug is now fixed, but theia pins an old version of
# vscode-uri. Once theia is updated to use a more recent version
# of vscode-uri:
# - remove [vscode-uri] section
# - remove the commands below
# - remove component/tar/buildout.cfg
# - remove the "resolution" field in package.json
# - regenerate yarn.lock
cd %(location)s
${tar:location}/bin/tar -xzf ${vscode-uri:target}
mv vscode-uri-${vscode-uri:revision} vscode-uri
......
......@@ -19,7 +19,7 @@ md5sum = a27e2cb34e4efe2ed0d4698f505554f0
[yarn.lock]
_update_hash_filename_ = yarn.lock
md5sum = ae0f135e9c32967cc7cbc0a708225b60
md5sum = 09c1f7476afe3ecbf1c38891025336df
[ms-python-disable-jedi-buildout.patch]
_update_hash_filename_ = ms-python-disable-jedi-buildout.patch
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -15,7 +15,7 @@
[instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = bf611d4551e6c2d4ea5fd22c3ae8ecfd
md5sum = 43b3435b3bc08db42335c03b5b8fe465
[instance]
_update_hash_filename_ = instance.cfg.in
......
......@@ -14,6 +14,7 @@ theia-environment-parts =
theia-parts =
frontend-instance
slapos-standalone-bin-wrapper
promises
parts =
......@@ -629,6 +630,11 @@ hash-files =
hostname = $${slapos-standalone-config:ipv4}
port = $${slapos-standalone-config:port}
[slapos-standalone-bin-wrapper]
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:bin}/slapos
command-line = $${slapos-standalone-config:base-directory}/bin/slapos
# Slapos Standalone Autoprocessing
# --------------------------------
......
......@@ -67,7 +67,7 @@ class TheiaTestCase(SlapOSInstanceTestCase):
try:
return cls._theia_slapos
except AttributeError:
cls._theia_slapos = slapos = cls.getPath('srv', 'runner', 'bin', 'slapos')
cls._theia_slapos = slapos = cls.getPath('bin', 'slapos')
return slapos
@classmethod
......
......@@ -300,7 +300,7 @@ simplegeneric = 0.8.1
singledispatch = 3.4.0.3
six = 1.16.0
slapos.cookbook = 1.0.329
slapos.core = 1.10.6
slapos.core = 1.10.7
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.5
......
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