Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Alain Takoudjou
slapos
Commits
41dcbed2
Commit
41dcbed2
authored
1 year ago
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Theia 1.44.0
See merge request
!1489
parents
66e5ac0b
2e329ff3
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
997 additions
and
980 deletions
+997
-980
component/theia/buildout.cfg
component/theia/buildout.cfg
+8
-6
component/theia/buildout.hash.cfg
component/theia/buildout.hash.cfg
+1
-1
component/theia/yarn.lock
component/theia/yarn.lock
+979
-970
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+1
-1
software/theia/instance-theia.cfg.jinja.in
software/theia/instance-theia.cfg.jinja.in
+6
-0
software/theia/test/test.py
software/theia/test/test.py
+1
-1
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
component/theia/buildout.cfg
View file @
41dcbed2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
component/theia/buildout.hash.cfg
View file @
41dcbed2
...
...
@@ -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 diff is collapsed.
Click to expand it.
component/theia/yarn.lock
View file @
41dcbed2
This source diff could not be displayed because it is too large. You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
software/theia/buildout.hash.cfg
View file @
41dcbed2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
software/theia/instance-theia.cfg.jinja.in
View file @
41dcbed2
...
...
@@ -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
# --------------------------------
...
...
This diff is collapsed.
Click to expand it.
software/theia/test/test.py
View file @
41dcbed2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
stack/slapos.cfg
View file @
41dcbed2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment