diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-25 12:10:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-25 12:10:52 +0300 |
| commit | 326b4d3216d107b40142ee847c06f2c41a1ef220 (patch) | |
| tree | f5190e9c606a92c0ed4ce606a52b49366055065e /doc/ci/migration | |
| parent | 92e4789eb069d5fe43025601c6b7839fddda3ad1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/migration')
| -rw-r--r-- | doc/ci/migration/circleci.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/migration/circleci.md b/doc/ci/migration/circleci.md index 106f5b3d819..d85c1137f6a 100644 --- a/doc/ci/migration/circleci.md +++ b/doc/ci/migration/circleci.md @@ -121,11 +121,11 @@ stages: - test - deploy -job 1: +job1: stage: build script: make build dependencies -job 2: +job2: stage: build script: make build artifacts @@ -216,12 +216,12 @@ jobs: Example of the same workflow using `rules` in GitLab CI/CD: ```yaml -deploy_prod: +deploy: stage: deploy script: - - echo "Deploy to production server" + - echo "Deploy job" rules: - - if: '$CI_COMMIT_BRANCH == "main"' + - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH =~ /^rc-/' ``` ### Caching |