Merge branch 'main' into file-track

.ci/travis/publish_multiarch.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# See: https://sipb.mit.edu/doc/safe-shell/
+set -e
+
+PUBLISH_IMAGES_LIST=(
+  che-theia-dev
+  che-theia
+  che-theia-endpoint-runtime-binary
+  che-theia-vsix-installer
+)
+
+for image in "${PUBLISH_IMAGES_LIST[@]}"; do
+    the_image="${REGISTRY}/${ORGANIZATION}/${image}"
+    AMEND=""
+    AMEND+=" --amend ${the_image}:${TAG}-amd64";
+    AMEND+=" --amend ${the_image}:${TAG}-arm64";
+    AMEND+=" --amend ${the_image}:${TAG}-ppc64le";
+    AMEND+=" --amend ${the_image}:${TAG}-s390x";
+
+    # Create manifest and push multiarch image
+    eval docker manifest create "${the_image}:${TAG}" "$AMEND"
+    docker manifest push "${the_image}:${TAG}"
+
+    if [[ "${TAG}" == "next-travis" ]]; then
+       eval docker manifest create "${the_image}:${SHORT_SHA}" "$AMEND"
+       docker manifest push "${the_image}:${SHORT_SHA}"
+    else 
+       eval docker manifest create "${the_image}:latest-travis" "$AMEND"
+       docker manifest push "${the_image}:latest-travis"
+    fi
+done

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+# Disable the blank issue
+blank_issues_enabled: false
+
+# Make redirect to eclipse che issue tracker
+contact_links:
+  - name: Create Issue
+    url: https://github.com/eclipse/che/issues/new/choose
+    about: File issues on the main Eclipse Che repository

.github/PULL_REQUEST_TEMPLATE.md

@@ -37,6 +37,8 @@ Pull Request Policy: https://github.com/eclipse/che/wiki/Development-Workflow#pu
 - [ ] [Relevant user documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated)
 - [ ] [Relevant contributing documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated)
 - [ ] [CI/CD changes implemented, documented and communicated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#cicd-changes-implemented-documented-and-communicated)
+- [ ] Optional Companion PR for updating the HappyPath tests is approved and ready to be merged
+
 
 ### Reviewers
 

.github/workflows/check-theia-branch.yml

@@ -38,3 +38,29 @@ jobs:
         docker pull quay.io/eclipse/che-theia-dev:next
         docker tag quay.io/eclipse/che-theia-dev:next eclipse/che-theia-dev:next
         ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.alpine --build-args:THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }} --branch:${{ github.event.inputs.theia_branch }}
+  
+  travis-build:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - name: Trigger build on Travis CI
+      run: |
+        body="{
+        \"request\":{
+        \"config\": {
+          \"env\": {
+            \"global\": [
+              \"THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }}\",
+              \"THEIA_BRANCH=${{ github.event.inputs.theia_branch }}\"
+             ]
+           }
+        } 
+        }}"
+
+        curl -s -X POST \
+        -H "Content-Type: application/json" \
+        -H "Accept: application/json" \
+        -H "Travis-API-Version: 3" \
+        -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \
+        -d "$body" \
+        https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests

.github/workflows/build-publish-next.yml → .github/workflows/next-build.yml

@@ -10,6 +10,7 @@
 name: Build & Publish `next`
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -47,3 +48,38 @@ jobs:
       run: printf "//registry.npmjs.org/:_authToken=${{ secrets.CHE_NPM_AUTH_TOKEN }}\n" >> ~/.npmrc
     - name: Publish packages to npmjs
       run: yarn publish:next
+  notify:
+    runs-on: ubuntu-20.04
+    needs: build
+    if: always() && (needs.build.result == 'failure')
+    steps:
+    - name: Create failure MM message
+      if: ${{ failure() }}
+      run: |
+        echo "{\"text\":\":no_entry_sign: Next Che Theia build has failed: https://github.com/eclipse-che/che-theia/actions/workflows/next-build.yml\"}" > mattermost.json
+    - name: Send MM message
+      if: ${{ success() }} || ${{ failure() }}
+      uses: mattermost/[email protected]
+      env:
+        MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
+        MATTERMOST_CHANNEL: eclipse-che-releases
+        MATTERMOST_USERNAME: che-bot
+
+  travis-build:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - name: Trigger build on Travis CI
+      run: |
+        body="{
+        \"request\":{
+        \"branch\":\"main\"
+        }}"
+
+        curl -s -X POST \
+        -H "Content-Type: application/json" \
+        -H "Accept: application/json" \
+        -H "Travis-API-Version: 3" \
+        -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \
+        -d "$body" \
+        https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests

.github/workflows/pr-build.yml

@@ -48,3 +48,31 @@ jobs:
         docker pull quay.io/eclipse/che-theia-dev:next
         docker tag quay.io/eclipse/che-theia-dev:next eclipse/che-theia-dev:next
         ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.${{matrix.dist}}
+      # use CDN to make sure we're testing our webpack customizer properly
+      env:
+        CDN_PREFIX: https://static.developers.redhat.com/che/theia_artifacts/
+        MONACO_CDN_PREFIX: https://cdn.jsdelivr.net/npm/
+
+  travis-build:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - name: Trigger build on Travis CI
+      run: |
+        body="{
+        \"request\":{
+        \"config\": {
+          \"env\": {
+            \"global\": [
+              \"PR_NUMBER=${{ github.event.pull_request.number }}\"
+             ]
+           }
+        }
+        }}"
+        curl -s -X POST \
+        -H "Content-Type: application/json" \
+        -H "Accept: application/json" \
+        -H "Travis-API-Version: 3" \
+        -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \
+        -d "$body" \
+        https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests

.github/workflows/release.yml

@@ -89,6 +89,7 @@ jobs:
   notify:
     runs-on: ubuntu-20.04
     needs: build
+    if: always() && ((needs.build.result == 'failure') || (needs.build.result == 'success'))
     steps:
     - name: Create failure MM message
       if: ${{ failure() }}
@@ -104,3 +105,29 @@ jobs:
         MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
         MATTERMOST_CHANNEL: eclipse-che-releases
         MATTERMOST_USERNAME: che-bot
+  # TODO: uncomment this when we're happy that travis is working for PRs
+  # travis-release:
+  #   needs: build
+  #   runs-on: ubuntu-latest
+  #   continue-on-error: true
+  #   steps:
+  #   - name: Trigger build on Travis CI
+  #     run: |
+  #       body="{
+  #       \"request\":{
+  #       \"config\": {
+  #         \"env\": {
+  #           \"global\": [
+  #             \"TAG=${{ github.event.inputs.version }}\"
+  #            ]
+  #          }
+  #       }
+  #       }}"
+
+  #       curl -s -X POST \
+  #       -H "Content-Type: application/json" \
+  #       -H "Accept: application/json" \
+  #       -H "Travis-API-Version: 3" \
+  #       -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \
+  #       -d "$body" \
+  #       https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests