Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Dummy changes. Please, ignore. #1108

Draft
wants to merge 41 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2b1e810
chore(lib): Include lib folder when publishing the npm module
benoitf Jun 7, 2021
fab1cdf
fix(cleanup): Remove the unused devfileUrl field
benoitf Jun 8, 2021
7e0a28f
Introduce build process using yarn link (#955)
tsmaeder Jun 8, 2021
cd2481d
Use correct base dir for che-theia extensions (#1130)
tsmaeder Jun 9, 2021
f705e77
fix(generator): Increase jest timeout to give the test extra time whe…
vitaliy-guliy Jun 9, 2021
51347cb
fix(yeoman): Update Theia plugin yeoman generator (#1133)
vitaliy-guliy Jun 11, 2021
0ecc24e
fix(plugins-view): Register custom plugin registries from devfile plu…
vinokurig Jun 11, 2021
158bff3
feat(ports-plugin): Handle devworkspaces
benoitf Jun 8, 2021
363bc97
fix(ssh-plugin): Disable the plug-in on DevWorkspace as there is no R…
benoitf Jun 11, 2021
0311add
feat(recommendations): delegate find to theia API
benoitf Jun 14, 2021
5b60d47
build(webpack): Upgrade to Webpack 5 to align with the upstream (#1134)
azatsarynnyy Jun 15, 2021
6c6aba4
fix(task): Temporary fix to reveal tasks executed from the myworkspac…
sunix Jun 15, 2021
c1b559d
build(happy-paths): Don't run Happy Path GH Workflow when the changes…
azatsarynnyy Jun 15, 2021
739678b
Split the GH Workflow to avoid running the build jobs when no code is…
azatsarynnyy Jun 15, 2021
52c5449
feat: Provides configured certificate/proxy method to get resources
benoitf Jun 16, 2021
3b53fab
chore(tasks): Align Task Service to upstream changes
RomanNikitenko Jun 16, 2021
859f171
chore: Pin Che-Theia to upstream Theia before the breaking changes
RomanNikitenko Jun 16, 2021
0dbddfb
chore: Align Che-Theia to upstream changes
RomanNikitenko Jun 16, 2021
7c19cd8
Install 'libsecret' as it's used by keytar that Theia depends on
azatsarynnyy Jun 16, 2021
1792c30
Update git built-in to the version that supports FileDecoration API
azatsarynnyy Jun 16, 2021
917404b
feat(recommendation-plugin): do not use axios anymore from the plug-i…
benoitf Jun 16, 2021
881eafa
feat(plugins): use common http service instead of private Axios instance
benoitf Jun 17, 2021
f2a56d1
refactor: Update `master` branch mentioning to `main` (#1147)
azatsarynnyy Jun 18, 2021
ce00335
fix: Update link after switching from master to main (#1149)
azatsarynnyy Jun 18, 2021
391c82d
Adapt unit tests to git 1.8 used for HappyPath tests
azatsarynnyy Jun 20, 2021
c07a56a
fix(recommendations-plugin): avoid duplicated plug-ins
benoitf Jun 18, 2021
979b91f
chore(cleanup): Remove unwanted files
benoitf Jun 21, 2021
9573684
fix(plugins): Change path to plugins index.json file (#1154)
vitaliy-guliy Jun 23, 2021
5aaa4de
feat(explorer): Display Welcome panel when there are no projects in a…
RomanNikitenko Jun 23, 2021
f8c8cbf
build: Pin Che-Theia to upstream Theia before the breaking changes
RomanNikitenko Jul 2, 2021
6dad56a
chore(tests): Use newer minikube 1.21.0 to run happy path tests
RomanNikitenko Jul 5, 2021
c228bef
chore(codeowners): remove me from CODEOWNERS (#1160)
ericwill Jul 6, 2021
a673fec
ci: Remove nightly images references
mkuznyetsov Jul 8, 2021
46fdec5
fix(generator): fix excluded packages in production command
zWingz Jul 8, 2021
d56857d
chore(dogfooding): adding libsecret to theia dev container
sunix Jul 5, 2021
e0feedb
chore: Update base from ubi8-minimal:8.4-200 to ubi8-minimal:8.4-205
nickboldt Jul 8, 2021
efc0eb9
chore: Update base from ubi8-minimal:8.4-200 to ubi8-minimal:8.4-205
nickboldt Jul 8, 2021
f340cd0
chore: Update base from ubi8/nodejs-12:1-87 to ubi8/nodejs-12:1-90
nickboldt Jul 8, 2021
b4eb596
chore: Update base from ubi8/nodejs-12:1-87 to ubi8/nodejs-12:1-90
nickboldt Jul 8, 2021
acfb733
chore: Update base from ubi8/nodejs-12:1-87 to ubi8/nodejs-12:1-90
nickboldt Jul 8, 2021
62e41aa
Dummy changes
dmytro-ndp May 18, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ devfiles/** @azatsarynnyy @RomanNikitenko @vzhukovs @benoitf
dockerfiles/** @azatsarynnyy @RomanNikitenko @vzhukovs @benoitf
extensions/** @azatsarynnyy @RomanNikitenko @vzhukovs @benoitf
generator/** @azatsarynnyy @RomanNikitenko @vzhukovs @benoitf
plugins/** @ericwill @vinokurig @vitaliy-guliy @svor @tsmaeder @benoitf @sunix
plugins/** @vinokurig @vitaliy-guliy @svor @tsmaeder @benoitf @sunix
2 changes: 1 addition & 1 deletion .github/workflows/build-publish-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name: Build & Publish `next`
on:
push:
branches:
- master
- main

jobs:
build:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/happy-path-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
name: Happy Path

# Trigger the workflow on pull request
on: [pull_request]
on:
pull_request:
paths-ignore:
- '**/*.md'
- devfile.yaml
- 'devfiles/*'
- 'tools/*'

jobs:
happy-path:
Expand Down Expand Up @@ -41,7 +47,7 @@ jobs:
id: run-minikube
uses: che-incubator/setup-minikube-action@next
with:
minikube-version: v1.20.0
minikube-version: v1.21.0
- name: Deploy Eclipse Che
id: deploy-che
uses: che-incubator/che-deploy-action@next
Expand Down
20 changes: 8 additions & 12 deletions .github/workflows/pr.yml → .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020 Red Hat, Inc.
# Copyright (c) 2021 Red Hat, Inc.
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
Expand All @@ -12,19 +12,15 @@
name: CI

# Trigger the workflow on pull request
on: [pull_request]
on:
pull_request:
paths-ignore:
- '**/*.md'
- devfile.yaml
- 'devfiles/*'
- 'tools/*'

jobs:
# check EOF newline
linelint:
runs-on: ubuntu-20.04
name: eof-newline
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Linelint
uses: fernandrone/[email protected]
id: linelint
node-build:
runs-on: ubuntu-20.04
steps:
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/pr-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# Copyright (c) 2020 Red Hat, Inc.
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#

name: CI

on: [pull_request]

jobs:
# check EOF newline
linelint:
runs-on: ubuntu-20.04
name: eof-newline
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Linelint
uses: fernandrone/[email protected]
id: linelint
2 changes: 1 addition & 1 deletion .github/workflows/publish-built-in-extension-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: publish

on:
push:
branches: [ master ]
branches: [ main ]
schedule:
- cron: '0 1 * * *'
jobs:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ yarn-error.log
*.theia
asset-*
.eslintcache
plugins/vscode-*

# MacOS
.DS_Store
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ In this section we are going to start a new workspace to work on che-theia. The
The devfile could be started using `chectl`:

```
chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/master/devfiles/che-theia-all.devfile.yaml
chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/main/devfiles/che-theia-all.devfile.yaml
```
At workspace start, Che will clone Theia and Che-theia.

Expand All @@ -78,7 +78,7 @@ $ che-theia init --dev

This command will checkout all extensions in `/projects/theia/che` folder and create symbolic link into `/projects/theia/packages` folder.

By default, extensions list is retrieved from https://github.com/eclipse-che/che-theia/blob/master/che-theia-init-sources.yml
By default, extensions list is retrieved from https://github.com/eclipse-che/che-theia/blob/main/che-theia-init-sources.yml

### Step 3: Code che-theia extensions
At this point you can code on che-theia extensions inside `/projects/theia/che/che-theia/extensions` folder. Extensions changes would be taken into account in the next step.
Expand Down Expand Up @@ -143,7 +143,7 @@ and run these plugins with the existing che-theia app:

## Che-Theia development on che.openshift.io

There is a [devfile](https://github.com/eclipse-che/che-theia/blob/master/devfiles/hosted-che-dogfooding.devfile.yaml) to develop Che-Theia on [che.openshift.io](https://che.openshift.io)
There is a [devfile](https://github.com/eclipse-che/che-theia/blob/main/devfiles/hosted-che-dogfooding.devfile.yaml) to develop Che-Theia on [che.openshift.io](https://che.openshift.io)

Projects directory which is a Persistent Volume on [che.openshift.io](https://che.openshift.io) is limited to 1 gigabyte. It's not enough to build Che-Theia.
The main idea is to use `/tmp/theia` directotry. Amount for this directory is limited to 3 gigabytes, which is enough to build Che-Theia and run.
Expand All @@ -153,7 +153,7 @@ In comparing with `/projects`, temporary directory is not persisted and is clear

Use the badge to create a workspace using factory

[![Try it on che.openshift.io](https://img.shields.io/static/v1?label=che&message=openshift.io&color=orange)](https://che.openshift.io/f?url=https://raw.githubusercontent.com/eclipse-che/che-theia/master/devfiles/hosted-che-dogfooding.devfile.yaml)
[![Try it on che.openshift.io](https://img.shields.io/static/v1?label=che&message=openshift.io&color=orange)](https://che.openshift.io/f?url=https://raw.githubusercontent.com/eclipse-che/che-theia/main/devfiles/hosted-che-dogfooding.devfile.yaml)

### Step 1: Initialize Che-Theia in `/tmp/theia` directory

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<br/>
<div id="che-theia-logo" align="center" style="vertical-align: middle">

<img src="https://raw.githubusercontent.com/eclipse-che/che-theia/master/extensions/eclipse-che-theia-about/src/browser/style/che-logo-light.svg?sanitize=true" alt="Che Logo" width="200" height="60" />
<img src="https://raw.githubusercontent.com/eclipse-che/che-theia/main/extensions/eclipse-che-theia-about/src/browser/style/che-logo-light.svg?sanitize=true" alt="Che Logo" width="200" height="60" />

<img src="https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia-logo.svg?sanitize=true" alt="Theia Logo" width="150" height="60"/>

Expand All @@ -22,7 +22,7 @@

<div style='margin:0 auto;width:80%;'>

![Che-Theia](https://raw.githubusercontent.com/eclipse-che/che-theia/master/che-theia-screenshot.png)
![Che-Theia](https://raw.githubusercontent.com/eclipse-che/che-theia/main/che-theia-screenshot.png)

</div>

Expand Down Expand Up @@ -80,15 +80,15 @@ The che-plugin of this editor is defined in the plugin registry https://github.c
# Contributing

## Contribute to Che-theia
Contributing to che-theia section is cover in [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md)
Contributing to che-theia section is cover in [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/main/CONTRIBUTING.md)


## Build container images

Building images is required only if you make some changes on `Dockerfile`s inside `dockerfiles` folder.
If it is about testing che-theia extensions or plugins, please refere to [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md).
If it is about testing che-theia extensions or plugins, please refere to [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/main/CONTRIBUTING.md).

To build che-theia docker images, please follow [dockerfiles/theia/README.md](https://github.com/eclipse-che/che-theia/blob/master/dockerfiles/theia/README.md) instructions.
To build che-theia docker images, please follow [dockerfiles/theia/README.md](https://github.com/eclipse-che/che-theia/blob/main/dockerfiles/theia/README.md) instructions.


# License
Expand All @@ -101,5 +101,5 @@ The Eclipse Che community is globally reachable through public chat rooms, maili
See https://www.eclipse.org/che/docs/che-7/overview/introduction-to-eclipse-che/#_joining_the_community

## Report issues

Issues are tracked on the main Eclipse Che Repository: https://github.com/eclipse/che/issues
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ To make another bugfix release of Che-Theia with the upstream Theia patch includ
### Include a diff file
It's also possible to use a diff file to patch the Theia while releasing Che-Theia:
- prepare a `*.patch` file
- put it into the [`patches`](https://github.com/eclipse-che/che-theia/tree/master/dockerfiles/theia/src/patches) folder and a sub-folder which name corresponds to the [`THEIA_VERSION`](https://github.com/eclipse-che/che-theia/blob/7.27.x/build.include#L15) value, e.g. `master`
- put it into the [`patches`](https://github.com/eclipse-che/che-theia/tree/main/dockerfiles/theia/src/patches) folder and a sub-folder which name corresponds to the [`THEIA_VERSION`](https://github.com/eclipse-che/che-theia/blob/7.27.x/build.include#L15) value, e.g. `master`
- continue the release process as usual
2 changes: 1 addition & 1 deletion build.include
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ IMAGE_TAG="next"
THEIA_GITHUB_REPO="eclipse-theia/theia"
THEIA_VERSION="master"
THEIA_BRANCH="master"
THEIA_COMMIT_SHA="2eb4319fb459f30ad897e8467878154c6790aaef"
THEIA_COMMIT_SHA="9648953cd6e8552b7e027558509ba77770bd8b6f"
THEIA_GIT_REFS="refs\\/heads\\/master"
THEIA_DOCKER_IMAGE_VERSION=

Expand Down
2 changes: 1 addition & 1 deletion che-theia-init-sources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ sources:
- plugins/telemetry-plugin
- plugins/github-auth-plugin
- plugins/recommendations-plugin
checkoutTo: master
checkoutTo: main
12 changes: 0 additions & 12 deletions cico_build_master.sh

This file was deleted.

12 changes: 0 additions & 12 deletions cico_build_nightly.sh

This file was deleted.

12 changes: 0 additions & 12 deletions cico_build_pr.sh

This file was deleted.

81 changes: 0 additions & 81 deletions cico_common.sh

This file was deleted.

2 changes: 1 addition & 1 deletion devfiles/hosted-che-dogfooding.devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ projects:
source:
location: 'https://github.com/eclipse-che/che-theia.git'
type: git
branch: master
branch: main

components:
- id: eclipse/che-theia/latest
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/theia-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN npm config set prefix "${HOME}/.npm-global" && \
echo "--global-folder \"${HOME}/.yarn-global\"" > ${HOME}/.yarnrc && \
yarn config set network-timeout 600000 -g && \
# add eclipse che-theia generator
yarn ${YARN_FLAGS} global add yo generator-code vsce @theia/[email protected]1562578105 file:${HOME}/eclipse-che-theia-generator && \
yarn ${YARN_FLAGS} global add yo generator-code vsce @theia/[email protected]1622834185 file:${HOME}/eclipse-che-theia-generator && \
rm -rf ${HOME}/eclipse-che-theia-generator && \
# Generate .passwd.template \
cat /etc/passwd | \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ RUN apk add --update --no-cache \
# synchronization tool
rsync \
# patch (required in che-theia to apply patches)
patch
patch \
# requirements to run theia with yarn start
libsecret
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
FROM registry.access.redhat.com/ubi8/nodejs-12:1-87
FROM registry.access.redhat.com/ubi8/nodejs-12:1-90
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
USER root
RUN yum install -y curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip rsync patch \
RUN yum install -y curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip rsync patch libsecret \
&& yum -y clean all && rm -rf /var/cache/yum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.4-200 as runtime
FROM registry.access.redhat.com/ubi8-minimal:8.4-205 as runtime
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.4-200 as runtime
FROM registry.access.redhat.com/ubi8-minimal:8.4-205 as runtime
2 changes: 1 addition & 1 deletion dockerfiles/theia/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ COPY --from=build-result /che-theia-build/plugins /default-theia-plugins
&& cat /etc/passwd | sed s#root:x.*#root:x:\${USER_ID}:\${GROUP_ID}::\${HOME}:/bin/bash#g > ${HOME}/passwd.template \
&& cat /etc/group | sed s#root:x:0:#root:x:0:0,\${USER_ID}:#g > ${HOME}/group.template \
# Add yeoman, theia plugin & VS Code generator and typescript (to have tsc/typescript working)
&& yarn global add ${YARN_FLAGS} yo @theia/[email protected]1562578105 generator-code [email protected] \
&& yarn global add ${YARN_FLAGS} yo @theia/[email protected]1622834185 generator-code [email protected] \
&& mkdir -p ${HOME}/.config/insight-nodejs/ \
&& chmod -R 777 ${HOME}/.config/ \
# Disable the statistics for yeoman
Expand Down
Loading