Skip to content

Commit 95c5e77

Browse files
authored
Merge pull request #628 from ckeditor/i/4146-use-new-ci-scripts-config
Using new CI scripts config with expilit arguments instead of environment variables.
2 parents 518950a + a01e379 commit 95c5e77

File tree

3 files changed

+77
-86
lines changed

3 files changed

+77
-86
lines changed

.circleci/config.yml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ commands:
2929
- run:
3030
name: Install dependencies
3131
command: pnpm install
32-
- prepare_environment_variables_commands
3332

3433
install_ssh_keys_command:
3534
description: "Install SSH keys"
@@ -68,27 +67,6 @@ commands:
6867
git config --global commit.gpgsign true
6968
git config --global tag.gpgSign true
7069
71-
prepare_environment_variables_commands:
72-
description: "Prepare non-secret environment variables"
73-
steps:
74-
- run:
75-
name: Prepare environment variables
76-
command: |
77-
#!/bin/bash
78-
79-
# Non-secret environment variables needed for the pipeline scripts.
80-
CKE5_GITHUB_ORGANIZATION="ckeditor"
81-
CKE5_GITHUB_REPOSITORY="ckeditor5-react"
82-
CKE5_CIRCLE_APPROVAL_JOB_NAME="release_approval"
83-
CKE5_GITHUB_RELEASE_BRANCH="master"
84-
85-
echo export CKE5_CIRCLE_APPROVAL_JOB_NAME=$CKE5_CIRCLE_APPROVAL_JOB_NAME >> $BASH_ENV
86-
echo export CKE5_GITHUB_RELEASE_BRANCH=$CKE5_GITHUB_RELEASE_BRANCH >> $BASH_ENV
87-
echo export CKE5_GITHUB_ORGANIZATION=$CKE5_GITHUB_ORGANIZATION >> $BASH_ENV
88-
echo export CKE5_GITHUB_REPOSITORY=$CKE5_GITHUB_REPOSITORY >> $BASH_ENV
89-
echo export CKE5_GITHUB_REPOSITORY_SLUG="$CKE5_GITHUB_ORGANIZATION/$CKE5_GITHUB_REPOSITORY" >> $BASH_ENV
90-
echo export CKE5_COMMIT_SHA1=$CIRCLE_SHA1 >> $BASH_ENV
91-
9270
jobs:
9371
notify_ci_failure:
9472
docker:
@@ -112,11 +90,8 @@ jobs:
11290
circleci-agent step halt
11391
fi
11492
- run:
115-
environment:
116-
CKE5_SLACK_NOTIFY_HIDE_AUTHOR: << parameters.hideAuthor >>
117-
CKE5_PIPELINE_NUMBER: << pipeline.number >>
11893
name: Waiting for other jobs to finish and sending notification on failure
119-
command: pnpm ckeditor5-dev-ci-circle-workflow-notifier
94+
command: pnpm ckeditor5-dev-ci-circle-workflow-notifier --task "pnpm ckeditor5-dev-ci-notify-circle-status --pipeline-id << pipeline.number >> --hide-author << parameters.hideAuthor >>"
12095
no_output_timeout: 1h
12196

12297
validate_and_tests:
@@ -203,7 +178,7 @@ jobs:
203178
fi
204179
- run:
205180
name: Trigger the release pipeline
206-
command: pnpm ckeditor5-dev-ci-trigger-circle-build
181+
command: pnpm ckeditor5-dev-ci-trigger-circle-build --slug ckeditor/ckeditor5-react --release-branch master
207182

208183
release_project:
209184
docker:
@@ -233,7 +208,7 @@ jobs:
233208
# Do not fail if the Node script ends with non-zero exit code.
234209
set +e
235210
236-
pnpm ckeditor5-dev-ci-is-job-triggered-by-member
211+
pnpm ckeditor5-dev-ci-is-job-triggered-by-member --job release_approval --organization ckeditor --team ckeditor-5-publishers
237212
EXIT_CODE=$( echo $? )
238213
239214
if [ ${EXIT_CODE} -ne 0 ];
@@ -243,7 +218,7 @@ jobs:
243218
fi
244219
- run:
245220
name: Disable the redundant workflows option
246-
command: pnpm ckeditor5-dev-ci-circle-disable-auto-cancel-builds
221+
command: pnpm ckeditor5-dev-ci-circle-disable-auto-cancel-builds --organization ckeditor --repository ckeditor5-react
247222
- run:
248223
name: Prepare the new version to release
249224
command: npm run release:prepare-packages -- --verbose
@@ -252,7 +227,7 @@ jobs:
252227
command: npm run release:publish-packages -- --verbose
253228
- run:
254229
name: Enable the redundant workflows option
255-
command: pnpm ckeditor5-dev-ci-circle-enable-auto-cancel-builds
230+
command: pnpm ckeditor5-dev-ci-circle-enable-auto-cancel-builds --organization ckeditor --repository ckeditor5-react
256231
when: always
257232
- run:
258233
name: Pack the "release/" directory (in case of failure)

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
"react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
3636
},
3737
"devDependencies": {
38-
"@ckeditor/ckeditor5-dev-bump-year": "^53.0.0",
39-
"@ckeditor/ckeditor5-dev-changelog": "^53.0.0",
40-
"@ckeditor/ckeditor5-dev-ci": "^53.0.0",
41-
"@ckeditor/ckeditor5-dev-release-tools": "^53.0.0",
42-
"@ckeditor/ckeditor5-dev-utils": "^53.0.0",
38+
"@ckeditor/ckeditor5-dev-bump-year": "^54.0.0",
39+
"@ckeditor/ckeditor5-dev-changelog": "^54.0.0",
40+
"@ckeditor/ckeditor5-dev-ci": "^54.0.0",
41+
"@ckeditor/ckeditor5-dev-release-tools": "^54.0.0",
42+
"@ckeditor/ckeditor5-dev-utils": "^54.0.0",
4343
"@testing-library/dom": "^10.3.1",
4444
"@testing-library/jest-dom": "^6.4.8",
4545
"@testing-library/react": "^16.0.0",

0 commit comments

Comments
 (0)