Skip to content

Update Theia to 1.22.1 #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Feb 11, 2022
Merged

Update Theia to 1.22.1 #791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bbeeb08
Update Theia to 1.22.1
msujew Jan 31, 2022
593d15f
updated CI
fstasi Jan 31, 2022
3118b4c
Simply use `--ignore-engines`
msujew Feb 3, 2022
18d6823
Use correct --ignore-engines
msujew Feb 3, 2022
094c71a
Fix semver#valid call
msujew Feb 3, 2022
72bbed7
Use C++17
msujew Feb 3, 2022
4a4fbe6
updated documentation
fstasi Feb 3, 2022
fe91f6b
Fix the C++ version
msujew Feb 7, 2022
da0d1ab
Build flag for cpp
msujew Feb 7, 2022
e9d311b
add disclaimer with correct node version
fstasi Feb 7, 2022
dc0b644
Update `electron-builder`
msujew Feb 8, 2022
c2e6e30
Fix `Electron.Menu` issue
msujew Feb 8, 2022
70d3748
Skip electron rebuild
msujew Feb 8, 2022
4775259
Rebuild native dependencies beforehand
msujew Feb 9, 2022
97d15f7
Merge remote-tracking branch 'origin/main' into msujew/theia-update-1.22
fstasi Feb 11, 2022
505dd20
Use resolutions section
msujew Feb 11, 2022
2d89761
Update template-package.json as well
msujew Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix the C++ version
  • Loading branch information
@msujew
msujew committed Feb 7, 2022
commit fe91f6bfcb87c721141453324899acd16d6b88be
4 changes: 2 additions & 2 deletions electron/build/template-package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"scripts": {
"build": "yarn download:plugins && theia build --mode development && yarn patch",
"build:publish": "yarn download:plugins && theia build --mode production && yarn patch",
"package": "cross-env DEBUG=* && electron-builder --publish=never",
"package:publish": "cross-env DEBUG=* && electron-builder --publish=always",
"package": "cross-env DEBUG=* && electron-builder --publish=never -std=c++14",
"package:publish": "cross-env DEBUG=* && electron-builder --publish=always -std=c++14",
"download:plugins": "theia download:plugins",
"patch": "ncp ./patch/main.js ./src-gen/backend/main.js"
},
Expand Down
6 changes: 3 additions & 3 deletions electron/packager/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
//-------------------------------------------------------------------------------------------------+
// Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. |
//-------------------------------------------------------------------------------------------------+
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)} -std=c++17`, `Building the ${productName} application`);
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`);

//-------------------------------------------------------------------------------------------------------------------------+
// Test the application. With this approach, we cannot publish test results to GH Actions but save 6-10 minutes per builds |
Expand Down Expand Up @@ -176,8 +176,8 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
//-------------------------------------------------------------------------------------------+
// Install all private and public dependencies for the electron application and build Theia. |
//-------------------------------------------------------------------------------------------+
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} -std=c++17`, 'Installing dependencies');
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''} -std=c++17`, `Building the ${productName} application`);
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies');
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`);

//------------------------------------------------------------------------------+
// Create a throw away dotenv file which we use to feed the builder with input. |
Expand Down