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

chore: References from master to main branches #1181

Merged
merged 1 commit into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Please review the following before submitting a PR:
chectl's Contributing Guide: https://github.com/che-incubator/chectl/blob/master/CONTRIBUTING.md
Pull Request Policy: https://github.com/che-incubator/chectl/blob/master/CONTRIBUTING.md#push-changes-provide-pull-request
chectl's Contributing Guide: https://github.com/che-incubator/chectl/blob/main/CONTRIBUTING.md
Pull Request Policy: https://github.com/che-incubator/chectl/blob/main/CONTRIBUTING.md#push-changes-provide-pull-request
-->

### What does this PR do?
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-build-and-push-to-GH-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
# Red Hat, Inc. - initial API and implementation
name: Release - generate release and push artifacts to github pages (after PR approved)
on:
# Trigger the workflow on push only for the master and 7.y.x branches
# Trigger the workflow on push only for the main and 7.y.x branches
push:
branches:
- '7.*.x'
- 'master'
- 'main'
jobs:
build-and-deploy:
runs-on: ubuntu-20.04
Expand All @@ -33,7 +33,7 @@ jobs:
echo "::set-output name=chectl_version::$(cat VERSION)"
echo "::set-output name=gh_release_name::$(cat VERSION)"
echo "::set-output name=gh_tag::$(cat VERSION)"
elif [[ ${GITHUB_REF#refs/heads/} =~ master ]]; then
elif [[ ${GITHUB_REF#refs/heads/} =~ main ]]; then
CURRENT_DAY=$(date +'%Y%m%d')
SHORT_SHA1=$(git rev-parse --short HEAD)
echo "::set-output name=gh_tag::$(date +'%Y%m%d%H%M%S')"
Expand Down
20 changes: 11 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@

The development flow includes:

- [create workspace, clone sources](#create-workspace-clone-sources)
- [build](#build)
- [run tests](#run-tests)
- [generate devfile](#generate-devfile)
- [create workspace](#create-workspace)
- [package binaries](#package-binaries)
- [push changes, provide pull request](#push-changes-provide-pull-request)
- [make release](#make-release)
- [Contributing](#contributing)
- [Create workspace, clone sources](#create-workspace-clone-sources)
- [Build](#build)
- [Run tests](#run-tests)
- [Run](#run)
- [Generate Devfile](#generate-devfile)
- [Create Workspace](#create-workspace)
- [Package binaries](#package-binaries)
- [Push changes, provide Pull Request](#push-changes-provide-pull-request)
- [Make Release](#make-release)

## Create workspace, clone sources

To create a workpace you can use [devfile](devfile.yaml):

```
$ chectl workspace:start -f https://raw.githubusercontent.com/che-incubator/chectl/master/devfile.yaml
$ chectl workspace:start -f https://raw.githubusercontent.com/che-incubator/chectl/main/devfile.yaml
```

> See more about [devfile](https://redhat-developer.github.io/devfile)
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ chectl
[Eclipse Che](https://github.com/eclipse/che/) CLI

[![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
[![codecov](https://codecov.io/gh/che-incubator/chectl/branch/master/graph/badge.svg?token=ZBQtKMeiYu)](https://codecov.io/gh/che-incubator/chectl)
[![Build Status](https://travis-ci.org/che-incubator/chectl.svg?branch=master)](https://travis-ci.org/che-incubator/chectl)
![](https://img.shields.io/david/che-incubator/chectl.svg)
[![codecov](https://codecov.io/gh/che-incubator/chectl/branch/main/graph/badge.svg?token=ZBQtKMeiYu)](https://codecov.io/gh/che-incubator/chectl)

[![asciicast](https://asciinema.org/a/216201.svg)](https://asciinema.org/a/216201)

Expand All @@ -29,7 +27,7 @@ Issues are tracked on the main Eclipse Che Repository: https://github.com/eclips

There are two channels of `chectl`: `stable` and `next`

Stable is for all tagged versions of Eclipse Che. Next is updated after each commit/Pull Request being merged in master branch of the [Chectl repository](https://github.com/che-incubator/chectl).
Stable is for all tagged versions of Eclipse Che. Next is updated after each commit/Pull Request being merged in main branch of the [Chectl repository](https://github.com/che-incubator/chectl).

If you're using Windows x64, here is how to install chectl by using one single PowerShell command:

Expand Down Expand Up @@ -1023,4 +1021,4 @@ _See code: [src/commands/workspace/stop.ts](https://github.com/che-incubator/che

# Contributing

Contributing to chectl is covered in [CONTRIBUTING.md](https://github.com/che-incubator/chectl/blob/master/CONTRIBUTING.md)
Contributing to chectl is covered in [CONTRIBUTING.md](https://github.com/che-incubator/chectl/blob/main/CONTRIBUTING.md)
6 changes: 3 additions & 3 deletions make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ checkoutToReleaseBranch() {
echo "[INFO] $BRANCH exists."
resetChanges $BRANCH
else
echo "[INFO] $BRANCH does not exist. Will be created a new one from master."
resetChanges master
git push origin master:$BRANCH
echo "[INFO] $BRANCH does not exist. Will be created a new one from main."
resetChanges main
git push origin main:$BRANCH
fi
git checkout -B $VERSION
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"debug": "^4.3.1",
"eclipse-che": "git://github.com/eclipse/che#master",
"eclipse-che-devfile-workspace-operator": "git://github.com/devfile/devworkspace-operator#main",
"eclipse-che-operator": "git://github.com/eclipse/che-operator#master",
"eclipse-che-operator": "git://github.com/eclipse/che-operator#main",
"esprima": "^4.0.1",
"execa": "^4.0.3",
"fancy-test": "^1.4.9",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2380,15 +2380,15 @@ ecc-jsbn@~0.1.1:

"eclipse-che-devfile-workspace-operator@git://github.com/devfile/devworkspace-operator#main":
version "0.0.0"
resolved "git://github.com/devfile/devworkspace-operator#6e3b60fb0501c4c883732dad36d6e64e4496b9c3"
resolved "git://github.com/devfile/devworkspace-operator#871c0c80085a9ea15f8e715d2c19bbd279238b44"

"eclipse-che-operator@git://github.com/eclipse/che-operator#master":
"eclipse-che-operator@git://github.com/eclipse/che-operator#main":
version "0.0.0"
resolved "git://github.com/eclipse/che-operator#83bc83a70743003339b4c72b82bb921f1fad388e"
resolved "git://github.com/eclipse/che-operator#5e41f3812a615a715b51c2506b78901eb391a849"

"eclipse-che@git://github.com/eclipse/che#master":
version "0.0.0"
resolved "git://github.com/eclipse/che#0bd4e2e5e670fdb12fed75605b0ba787dd6d0a68"
resolved "git://github.com/eclipse/che#afa0232cda6046c6c589d5100e9806dc212cb085"

editorconfig@^0.15.0:
version "0.15.3"
Expand Down