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.

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

Jump to bottom

Add commands for alignment che-code with upstream #427

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Add commands for alignment che-code with upstream #427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,32 @@ commands:
podman build -f build/dockerfiles/assembly.libc.Dockerfile -t che-code .
group:
kind: run
- id: install-git-subtree
exec:
label: Install git-subtree
component: dev
workingDir: ${PROJECTS_ROOT}
commandLine: |
mkdir temp && cd temp
git clone https://github.com/git/git.git
cd git/contrib/subtree
make && make prefix=${PROJECTS_ROOT}/temp install
cp -r ${PROJECTS_ROOT}/temp/libexec/git-core/ ~/bin
rm -rf ${PROJECTS_ROOT}/temp
- id: add-remote-upstream
exec:
label: Add remote for upstream
component: dev
workingDir: ${PROJECTS_ROOT}/che-code
commandLine: |
git remote add upstream-code https://github.com/microsoft/vscode

- id: fetch-upstream-changes
exec:
label: Fetch upstream changes
component: dev
workingDir: ${PROJECTS_ROOT}/che-code
commandLine: |
git stash save --include-untracked
git fetch upstream-code main
./rebase.sh
Loading