diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2020-11-20 11:19:06 +0000 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2020-11-20 11:19:06 +0000 |
| commit | c0dee9008007b8a0f517914e8394dde4331ea81e (patch) | |
| tree | 14f6314115d990d63eb7792515fa6f630a18d774 | |
| parent | 38d3ac0404c75f18e6e265bc9da53776aefb828a (diff) | |
| parent | ea7fcc180894449017fb961a8f6dbda16f5814be (diff) | |
| download | gitlab-shell-c0dee9008007b8a0f517914e8394dde4331ea81e.tar.gz | |
Merge branch 'fix-ci-config-for-main' into 'main'
Fix CI config and README for new default branch
See merge request gitlab-org/gitlab-shell!437
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | README.md | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2591e2..e45639a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,8 @@ workflow: rules: &workflow_rules # For merge requests, create a pipeline. - if: '$CI_MERGE_REQUEST_IID' - # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.). - - if: '$CI_COMMIT_BRANCH == "master"' + # For `main` branch, create a pipeline (this includes on schedules, pushes, merges, etc.). + - if: '$CI_COMMIT_BRANCH == "main"' # For tags, create a pipeline. - if: '$CI_COMMIT_TAG' @@ -18,10 +18,17 @@ An overview of the four cases described above: 1. git pull over SSH -> gitlab-shell -> API call to gitlab-rails (Authorization) -> accept or decline -> establish Gitaly session 1. git push over SSH -> gitlab-shell (git command is not executed yet) -> establish Gitaly session -> (in Gitaly) gitlab-shell pre-receive hook -> API call to gitlab-rails (authorization) -> accept or decline push +## Default branch + +GitLab Shell is transitioning its default branch from `master` to `main`. For now, +both branches are valid. All changes go to the `main` branch and are synced manually +to `master` by the maintainers. We plan to remove the `master` branch as soon as +possible. The current status is being tracked in [issue 489](https://gitlab.com/gitlab-org/gitlab-shell/-/issues/489). + ## Code status -[](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=master) -[](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=master) +[](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=main) +[](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=main) [](https://codeclimate.com/github/gitlabhq/gitlab-shell) ## Requirements @@ -65,7 +72,7 @@ Starting with GitLab 8.12, GitLab supports Git LFS authentication through SSH. GitLab Shell is versioned by git tags, and the version used by the Rails application is stored in -[`GITLAB_SHELL_VERSION`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/GITLAB_SHELL_VERSION). +[`GITLAB_SHELL_VERSION`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/GITLAB_SHELL_VERSION). For each version, there is a raw version and a tag version: |