Skip to content

Commit 7aa621f

Browse files
RomanNikitenkoRomanNikitenko
committed
Merge branch 'main' into test
2 parents 698b02e + 5e6582d commit 7aa621f

17 files changed

Lines changed: 211 additions & 242 deletions

‎.github/dependabot.yml‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 5
8+
commit-message:
9+
prefix: "deps(actions)"
10+
11+
- package-ecosystem: "docker"
12+
directory: "/build/dockerfiles"
13+
schedule:
14+
interval: "weekly"
15+
open-pull-requests-limit: 3
16+
commit-message:
17+
prefix: "deps(docker)"
18+
19+
- package-ecosystem: "npm"
20+
directory: "/code"
21+
schedule:
22+
interval: "weekly"
23+
open-pull-requests-limit: 5
24+
commit-message:
25+
prefix: "deps(npm)"
26+
27+
- package-ecosystem: "npm"
28+
directory: "/code/remote"
29+
schedule:
30+
interval: "weekly"
31+
open-pull-requests-limit: 5
32+
commit-message:
33+
prefix: "deps(npm)"
34+
35+
- package-ecosystem: "npm"
36+
directory: "/code/build"
37+
schedule:
38+
interval: "weekly"
39+
open-pull-requests-limit: 5
40+
commit-message:
41+
prefix: "deps(npm)"
42+
43+
- package-ecosystem: "npm"
44+
directory: "/code/extensions"
45+
schedule:
46+
interval: "weekly"
47+
open-pull-requests-limit: 5
48+
commit-message:
49+
prefix: "deps(npm)"
50+
51+
- package-ecosystem: "npm"
52+
directory: "/code/extensions/che-api"
53+
schedule:
54+
interval: "weekly"
55+
open-pull-requests-limit: 5
56+
commit-message:
57+
prefix: "deps(npm)"
58+
59+
- package-ecosystem: "npm"
60+
directory: "/code/extensions/che-activity-tracker"
61+
schedule:
62+
interval: "weekly"
63+
open-pull-requests-limit: 5
64+
commit-message:
65+
prefix: "deps(npm)"
66+
67+
- package-ecosystem: "npm"
68+
directory: "/code/extensions/che-commands"
69+
schedule:
70+
interval: "weekly"
71+
open-pull-requests-limit: 5
72+
commit-message:
73+
prefix: "deps(npm)"
74+
75+
- package-ecosystem: "npm"
76+
directory: "/code/extensions/che-github-authentication"
77+
schedule:
78+
interval: "weekly"
79+
open-pull-requests-limit: 5
80+
commit-message:
81+
prefix: "deps(npm)"
82+
83+
- package-ecosystem: "npm"
84+
directory: "/code/extensions/che-port"
85+
schedule:
86+
interval: "weekly"
87+
open-pull-requests-limit: 5
88+
commit-message:
89+
prefix: "deps(npm)"
90+
91+
- package-ecosystem: "npm"
92+
directory: "/code/extensions/che-remote"
93+
schedule:
94+
interval: "weekly"
95+
open-pull-requests-limit: 5
96+
commit-message:
97+
prefix: "deps(npm)"
98+
99+
- package-ecosystem: "npm"
100+
directory: "/code/extensions/che-resource-monitor"
101+
schedule:
102+
interval: "weekly"
103+
open-pull-requests-limit: 5
104+
commit-message:
105+
prefix: "deps(npm)"
106+
107+
- package-ecosystem: "npm"
108+
directory: "/code/extensions/che-telemetry"
109+
schedule:
110+
interval: "weekly"
111+
open-pull-requests-limit: 5
112+
commit-message:
113+
prefix: "deps(npm)"
114+
115+
- package-ecosystem: "npm"
116+
directory: "/code/extensions/che-terminal"
117+
schedule:
118+
interval: "weekly"
119+
open-pull-requests-limit: 5
120+
commit-message:
121+
prefix: "deps(npm)"
122+
123+
- package-ecosystem: "npm"
124+
directory: "/launcher"
125+
schedule:
126+
interval: "weekly"
127+
open-pull-requests-limit: 5
128+
commit-message:
129+
prefix: "deps(npm)"
130+
131+

‎.github/workflows/pull-request-check-publish.yml‎

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ jobs:
2727
rm -rf /opt/hostedtoolcache
2828
df -h
2929
30-
- name: Login to Quay.io
31-
uses: docker/login-action@v3
32-
with:
33-
registry: quay.io
34-
username: ${{ secrets.QUAY_PULL_REQUESTS_USERNAME }}
35-
password: ${{ secrets.QUAY_PULL_REQUESTS_PASSWORD }}
36-
3730
- name: Download Pull Request Number artifact
3831
uses: actions/download-artifact@v4
3932
with:
@@ -71,49 +64,24 @@ jobs:
7164
run: |
7265
docker load -i che-code-amd64.tgz
7366
67+
- name: Login to Quay.io
68+
uses: docker/login-action@v3
69+
with:
70+
registry: quay.io
71+
username: ${{ secrets.QUAY_USERNAME }}
72+
password: ${{ secrets.QUAY_PASSWORD }}
73+
7474
- name: Push che-code-amd64 docker image
7575
run: |
76-
export IMAGE=quay.io/che-incubator-pull-requests/che-code:pr-${{env._PR_NUMBER}}-amd64
76+
export IMAGE=quay.io/${{ secrets.QUAY_USERNAME }}/che-code:pr-${{env._PR_NUMBER}}-amd64
7777
docker tag che-code-amd64 ${IMAGE}
7878
docker push ${IMAGE}
7979
echo "_CHE_CODE_AMD64_IMAGE=${IMAGE}" >> $GITHUB_ENV
80-
80+
8181
- name: Remove che-code-amd64 and prune
8282
run: |
8383
docker image rm che-code-amd64 || true
8484
docker system prune -af
85-
86-
- name: Load che-code-arm64 image
87-
run: |
88-
docker load -i che-code-arm64.tgz
89-
90-
- name: Push che-code-arm64 docker image
91-
run: |
92-
export IMAGE=quay.io/che-incubator-pull-requests/che-code:pr-${{env._PR_NUMBER}}-arm64
93-
docker tag che-code-arm64 ${IMAGE}
94-
docker push ${IMAGE}
95-
echo "_CHE_CODE_ARM64_IMAGE=${IMAGE}" >> $GITHUB_ENV
96-
97-
- name: Remove che-code-arm64 and prune
98-
run: |
99-
docker image rm che-code-arm64 || true
100-
docker system prune -af
101-
102-
- name: Load che-dev image
103-
run: |
104-
docker load -i che-dev.tgz
105-
106-
- name: Push che-dev docker image
107-
run: |
108-
export IMAGE=quay.io/che-incubator-pull-requests/che-code-dev:pr-${{env._PR_NUMBER}}-dev-amd64
109-
docker tag che-dev ${IMAGE}
110-
docker push ${IMAGE}
111-
echo "_CHE_DEV_IMAGE=${IMAGE}" >> $GITHUB_ENV
112-
113-
- name: Remove che-dev and prune
114-
run: |
115-
docker image rm che-dev || true
116-
docker system prune -af
11785
11886
- name: 'Comment PR'
11987
uses: actions/github-script@v7
@@ -124,5 +92,5 @@ jobs:
12492
issue_number: process.env._PR_NUMBER,
12593
owner: context.repo.owner,
12694
repo: context.repo.repo,
127-
body: `Pull Request images published ✨\n\nEditor amd64: [${process.env._CHE_CODE_AMD64_IMAGE}](https://${process.env._CHE_CODE_AMD64_IMAGE})\nEditor arm64: [${process.env._CHE_CODE_ARM64_IMAGE}](https://${process.env._CHE_CODE_ARM64_IMAGE})\nDev image: [${process.env._CHE_DEV_IMAGE}](https://${process.env._CHE_DEV_IMAGE})`
95+
body: `Pull Request images published ✨\n\nEditor amd64: [${process.env._CHE_CODE_AMD64_IMAGE}](https://${process.env._CHE_CODE_AMD64_IMAGE})`
12896
})

‎.github/workflows/pull-request-check.yml‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
dist: ['libc-ubi8', 'libc-ubi9', 'musl']
45-
runners: ['ubuntu-22.04', 'ubuntu-22.04-arm']
45+
runners: ['ubuntu-22.04']
4646
runs-on: ${{matrix.runners}}
4747
steps:
4848
- name: Set arch environment variable
@@ -79,7 +79,7 @@ jobs:
7979
strategy:
8080
fail-fast: false
8181
matrix:
82-
runners: ['ubuntu-22.04', 'ubuntu-22.04-arm']
82+
runners: ['ubuntu-22.04']
8383
runs-on: ${{matrix.runners}}
8484
steps:
8585
- name: Set arch environment variable
@@ -138,41 +138,3 @@ jobs:
138138
with:
139139
name: pull-request-number
140140
path: PR_NUMBER
141-
142-
dev:
143-
name: build-che-dev-image
144-
runs-on: ubuntu-22.04
145-
steps:
146-
- name: Checkout che-code source code
147-
uses: actions/checkout@v4
148-
149-
- name: Free up disk space
150-
run: |
151-
rm -rf /opt/hostedtoolcache
152-
df -h
153-
154-
- name: Cleanup docker images
155-
run: |
156-
docker system prune -af
157-
158-
- name: Build Che-Code Docker image
159-
run: |
160-
docker buildx build \
161-
--platform linux/amd64 \
162-
--progress=plain \
163-
-f build/dockerfiles/dev.Dockerfile \
164-
-t che-dev .
165-
166-
- name: Display docker images
167-
run: |
168-
docker images
169-
170-
- name: Compress che-dev image to a file
171-
run: |
172-
docker save che-dev | gzip > che-dev.tgz
173-
174-
- name: Upload che-dev docker image artifact
175-
uses: actions/upload-artifact@v4
176-
with:
177-
name: che-dev
178-
path: che-dev.tgz

‎.vscode/extensions.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"rooveterinaryinc.roo-cline"
4+
]
5+
}

‎README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,24 @@ To test your changes in Eclipse Che run the following VS Code tasks:
4848
3. `run` to run the VS Code server
4949
4. Follow the suggested URL to test your changes.
5050

51+
## Using Roo Code with Google Gemini
52+
53+
Roo Code is a powerful extension that brings AI-powered features to your Che-Code environment. To get started, connect it to Google Gemini for access to advanced language models.
54+
55+
### Extension Installation
56+
The "Roo Code" extension is included in the list of recommended extensions for this repository and should install automatically when you start your workspace. If it is not installed automatically, you can find it on the [Open VSX Registry](https://open-vsx.org/).
57+
58+
### Obtaining a Google Gemini API Key
59+
If you do not already have one, visit the Google Gemini website to create an API key.
60+
61+
### Configuring Google Gemini
62+
1. **Open Roo Code**: Launch the Roo Code extension from the Activity Bar in Che-Code.
63+
2. **Access Settings**: The first time you launch the extension, a welcome screen will appear with an option to create a Roo account or proceed without one. The settings will open automatically after you make a selection. Alternatively, you can access the settings by clicking the gear icon (⚙️) in the top-right corner of the Roo Code panel.
64+
3. **Configure the API Provider**:
65+
* **API Provider**: Select "Google Gemini" from the dropdown menu.
66+
* **API Key**: Paste your Gemini API key into the corresponding field.
67+
* **Model**: Choose your desired Gemini model, such as "gemini-2.5-pro," from the list of available options.
68+
5169
## Updates and branches
5270

5371
This repository has a main branch being rebased on the main remote branch of `Code-OSS`.

‎build/dockerfiles/linux-libc-ubi8.Dockerfile‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -91,58 +91,6 @@ RUN chmod a+x /checode/out/server-main.js \
9191
### Beginning of tests
9292
# Do not change line above! It is used to cut this section to skip tests
9393

94-
# Compile tests
95-
RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
96-
compile-extension:markdown-language-features \
97-
compile-extension:typescript-language-features \
98-
compile-extension:emmet \
99-
compile-extension:git \
100-
compile-extension:ipynb \
101-
compile-extension-media \
102-
compile-extension:configuration-editing
103-
104-
# Compile test suites
105-
# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
106-
RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
107-
108-
# install test dependencies
109-
ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
110-
RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
111-
# Install procps to manage to kill processes and centos stream repository
112-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
113-
ARCH=$(uname -m) && \
114-
yum install --nobest -y procps \
115-
https://vault.centos.org/centos/8/extras/${ARCH}/os/Packages/epel-release-8-11.el8.noarch.rpm \
116-
https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm \
117-
https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm; \
118-
fi
119-
120-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
121-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
122-
&& yum install -y chromium \
123-
&& PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) \
124-
&& rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" \
125-
&& ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
126-
fi
127-
128-
# use of retry and timeout
129-
COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
130-
RUN chmod u+x /opt/app-root/src/retry.sh
131-
132-
# Run integration tests (Browser)
133-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
134-
NODE_ARCH=$(echo "console.log(process.arch)" | node) \
135-
VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
136-
/opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
137-
fi
138-
139-
# Run smoke tests (Browser)
140-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
141-
NODE_ARCH=$(echo "console.log(process.arch)" | node) \
142-
VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
143-
/opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
144-
fi
145-
14694
# Do not change line below! It is used to cut this section to skip tests
14795
### Ending of tests
14896

0 commit comments

Comments
 (0)