Skip to content

Commit 1cf3bd1

Browse files
feiyangliu2023chunqilugithub-actions[bot]Feiyang Liusachinh-amazon
authored
Upgrade VSCode version to 1.108.2 and sync changes in branch 1.1 back to main (aws#140)
* update sqlite3 (aws#114) * update vscode/proxy-agent (aws#115) * adopt vscode/proxy-agent (aws#116) * Update VS Code submodule to 1.108.2 * Rebase patches common to all targets * Rebase patches for target code-editor-server * Rebase patches for target code-editor-sagemaker-server * Rebase patches for target code-editor-web-embedded * Rebase test patches for target code-editor-sagemaker-server * Rebase test patches for target code-editor-web-embedded * update patches to fix build error * fix errors in code-editor-web-embedded * fix errors in code-editor-sagemaker * Update package-lock.json overrides for all targets * Cherry-pick security updates and patches from main to 1.1 branch (aws#128) * override undici for remote distribution (aws#118) * Build on ubuntu-22.04 and fix the sagemaker ui poststart up patch(aws#121) * Add SageMaker version patch in main (aws#123) * fix patch errors from cherrypicking updates * update patches to fix cherrypicking errors and patch rebase conflicts * Fix OOM during build by freeing disk space and adding swap * Update approved packages for successful third-party-license generation * Update unified OSS attribution --------- Co-authored-by: Chunqiu Lu <chunqilu@amazon.nl> Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com> Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * add remove-ask-vscode.diff (aws#129) * Cherry pick recent changes in main to 1.1 (aws#130) * adopt vscode/proxy-agent (aws#116) * override undici for remote distribution (aws#118) * Update tar to fix security vulnerability (aws#126) --------- Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com> * remove presence of copilot in code editor (aws#131) Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl> * remove copilot related settings (aws#132) Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal> * Remove whole chat settings and update sagemaker version (aws#133) * remove whole chat settings competely * update sagemaker release version --------- Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal> * remove all chat settings from search (aws#134) Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal> * remove chat-related settings in different categories in setting (aws#135) Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl> * remove ai statistics in status bar (aws#136) Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl> * Update oss attribution and remove outdated patch --------- Co-authored-by: Chunqiu Lu <chunqilu@amazon.nl> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl> Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com> Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal>
1 parent db97d5f commit 1cf3bd1

70 files changed

Lines changed: 9931 additions & 11236 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/update-automation.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,18 @@ jobs:
216216
run: |
217217
git config user.name "github-actions[bot]"
218218
git config user.email "github-actions[bot]@users.noreply.github.com"
219+
220+
- name: Setup swap
221+
run: |
222+
# Remove existing swap if present
223+
sudo swapoff -a || true
224+
sudo rm -f /swapfile /mnt/swapfile || true
225+
# Create new swap
226+
sudo fallocate -l 12G /mnt/swapfile
227+
sudo chmod 600 /mnt/swapfile
228+
sudo mkswap /mnt/swapfile
229+
sudo swapon /mnt/swapfile
230+
free -h
219231
220232
- name: Build target
221233
env:

LICENSE-THIRD-PARTY

Lines changed: 293 additions & 772 deletions
Large diffs are not rendered by default.
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"code-oss-dev@1.101.2": "UNLICENSED",
3-
"jschardet@3.1.4": "LGPL-2.1-or-later"
3+
"jschardet@3.1.4": "LGPL-2.1-or-later",
4+
"chownr@3.0.0": "BlueOak-1.0.0",
5+
"tar@7.5.4": "BlueOak-1.0.0",
6+
"yallist@5.0.0": "BlueOak-1.0.0"
47
}

overrides/LICENSE-THIRD-PARTY

Lines changed: 293 additions & 772 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)