Skip to content
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.

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

Answered and Added some FAQ in Readme section #130

Open
wants to merge 69 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
d49e080
code web server initial commit
akosyakov Aug 6, 2021
488bc1c
Added remote terminal channel handler
spoenemann Aug 10, 2021
709dd63
Add startup scripts
filiptronicek Aug 30, 2021
a6faea7
Use absolute paths in the startup script
filiptronicek Sep 2, 2021
1b8bfd0
initial draft of readme for web-server branch
svenefftinge Sep 2, 2021
ef75917
Update README.md
svenefftinge Sep 3, 2021
6559bac
Update README.md
svenefftinge Sep 3, 2021
0df0ff5
Update README.md
svenefftinge Sep 3, 2021
a3fbfe6
Update README.md
svenefftinge Sep 3, 2021
07b580b
Update README.md
svenefftinge Sep 3, 2021
8ddc2db
package startup scripts and latest node 14
akosyakov Sep 3, 2021
94e36e7
Smoke test running
jeanp413 Aug 27, 2021
17fbbfc
Add explorer and terminal smoke tests
jeanp413 Sep 1, 2021
f663eac
Address Feedback
jeanp413 Sep 2, 2021
bc44905
Add web worker extension test
jeanp413 Sep 4, 2021
2728bae
Add server-cli smoke test
jeanp413 Sep 4, 2021
9c026d7
Terminal cli commads working
jeanp413 Sep 3, 2021
7903a2d
Fix errors after 1.60.0 update
jeanp413 Sep 4, 2021
dda25be
getting started
akosyakov Sep 6, 2021
12e0f12
Add extensionKind to product.json
jeanp413 Sep 7, 2021
3efac59
Update name to OpenVSCode Server
Sep 13, 2021
14338f1
update README with openvscode-server
akosyakov Sep 14, 2021
1012e53
Streamlined Readme
Sep 14, 2021
0ceddb7
Add sync script
jeanp413 Sep 15, 2021
3f7a641
Update sync script
jeanp413 Sep 15, 2021
7366838
Try to fix explorer smoke test in ci
jeanp413 Sep 17, 2021
2483d1f
Fix compilation after sync with upstream/main
jeanp413 Sep 17, 2021
5eb7897
Update sync script
jeanp413 Sep 17, 2021
7257688
Enable integration test
jeanp413 Sep 20, 2021
e4d18b0
Enable more tests
jeanp413 Sep 21, 2021
30d8de6
Skip failing test
jeanp413 Sep 21, 2021
a3657da
fix remote-terminal.ts
akosyakov Sep 21, 2021
f276398
Reenable integration test
jeanp413 Sep 21, 2021
70b0103
Disable flaky smoke test
jeanp413 Sep 21, 2021
79559a0
Delete SECURITY.md
ghuntley Sep 16, 2021
391f11d
Fix a spelling mistake in the README.md
timonbimon Sep 20, 2021
6829a66
rename web-server to opencode
akosyakov Sep 21, 2021
f66a33a
[server] user env service to locate built-in extensions
akosyakov Sep 21, 2021
7298786
add dev docs
akosyakov Sep 21, 2021
5e0854d
Update sync script
jeanp413 Sep 22, 2021
732318b
Update sync script
jeanp413 Sep 22, 2021
32b67f0
[build] only pack code and server binaries
akosyakov Sep 23, 2021
8b41448
Add more guides.
Sep 23, 2021
32d5d91
Align all guides with the guide template.
Sep 23, 2021
e53fd7e
Fix the path to the development.md.
Sep 23, 2021
d0244b4
Add list of supporter to readme
Sep 22, 2021
6df8b04
[sync] next to main
akosyakov Sep 24, 2021
780c1a6
add doc/sourcedive.snb.md
beyang Sep 27, 2021
327fb5d
Update link and image
dnilasor Sep 27, 2021
16ca400
Updates README & guides.
Sep 28, 2021
51551d5
remove authors, fix gitpod urls
akosyakov Sep 28, 2021
39eb08d
Updated path for guides
Sep 28, 2021
1dce39d
Fixed SUSE
Sep 28, 2021
afc70e2
add oauth setup instructions
dnilasor Sep 28, 2021
758a0c9
fix missing text in angle brackets
dnilasor Sep 28, 2021
b3162e7
Add links to the License & Chat badges.
mikenikles Sep 28, 2021
99d9227
fix service URLS
dnilasor Sep 28, 2021
a7148c0
Fix repo link in Deploy to Render
dnilasor Sep 28, 2021
6838364
Remove .git from link
dnilasor Sep 28, 2021
9320ca5
skip failing test for now
jeanp413 Sep 28, 2021
326e05e
Enable run tests on server build
jeanp413 Sep 29, 2021
b012f93
Numbering
hrittikhere Sep 28, 2021
cd13cd2
Create Azure VM Docs
hrittikhere Sep 28, 2021
982359c
Updates on boilerplate
hrittikhere Sep 28, 2021
b1ccfe7
Update Inbound Rules 🚀
hrittikhere Sep 28, 2021
aa211ec
Compile integration test when running from build
jeanp413 Sep 29, 2021
1311199
Update README.md
vikkastiwari Oct 2, 2021
16e20ba
Update README.md
vikkastiwari Oct 2, 2021
faf4b84
FAQ
vikkastiwari Oct 2, 2021
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
Add sync script
  • Loading branch information
jeanp413 committed Sep 28, 2021
commit 0ceddb7200c923402852fc56efc198b40579f413
77 changes: 77 additions & 0 deletions scripts/sync-with-upstream.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
#!/usr/bin/env bash

echo "Syncing openvscode-server with upstream"

exit_script() {
reason=$1
echo "Update script ended unsucessfully"
echo "Reason: $reason"
exit 1
}

if [[ "$OSTYPE" == "darwin"* ]]; then
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
ROOT=$(dirname $(dirname $(realpath "$0")))
else
ROOT=$(dirname $(dirname $(readlink -f $0)))
# --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm
# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader"
fi

cd $ROOT

local_branch="web-server"
upstream_url="https://github.com/microsoft/vscode.git"
upstream_branch="upstream/main"
base_commit_msg="code web server initial commit"

# Checks is there's an upstream remote repository and if not
# set it to $upstream_url
check_upstream() {
git remote -v | grep --quiet upstream
if [[ $? -ne 0 ]]; then
echo "Upstream repository not configured"
echo "Setting upstream URL to ${upstream_url}"
git remote add upstream $upstream_url > /dev/null
fi
}

# Gets the base commit
get_base_commit() {
local base_commit=$(git log --pretty="%H" --max-count=1 --grep "$base_commit_msg")
if [[ -z $base_commit ]]; then
exit_script "Could not find base commit"
fi
echo $base_commit
}

# Fetch updates from upstream and rebase
sync() {
echo "Fetching upstream..."
git fetch upstream > /dev/null
git checkout --quiet $local_branch > /dev/null
echo "Rebasing $local_branch branch over $upstream_branch branch from upstream"
git rebase --quiet --onto=$upstream_branch $(get_base_commit)^ $local_branch
if [[ $? -ne 0 ]]; then
echo "There are merge conflicts doing the rebase. Reverting changes"
git rebase --abort
exit_script "Could not rebase succesfully"
fi
echo "$local_branch sucessfully updated"
}

# Sync
check_upstream
sync

# Clean and build
# git clean -dfx
yarn && yarn server:init

# Configuration
export NODE_ENV=development
export VSCODE_DEV=1
export VSCODE_CLI=1

yarn smoketest --web --headless --electronArgs=$LINUX_EXTRA_ARGS