@ckeditor/ckeditor5-dev-ci 38.1.0 → 38.1.2

package/bin/notify-circle-status.js

@@ -16,6 +16,11 @@ const slackNotify = require( 'slack-notify' );
 // Described environment variables starting with "CKE5" should be added by the integrator.
 
 const {
+	/**
+	 * Required. Value of Circle's `pipeline.number` variable.
+	 */
+	CKE5_PIPELINE_NUMBER,
+
 	/**
 	 * Required. Token to a Github account with the scope: "repos". It is required for obtaining an author of
 	 * the commit if the build failed. The repository can be private and we can't use the public API.
@@ -48,10 +53,10 @@ const {
 	// Variables that are available by default in Circle environment.
 	CIRCLE_BRANCH,
 	CIRCLE_BUILD_NUM,
-	CIRCLE_BUILD_URL,
 	CIRCLE_PROJECT_REPONAME,
 	CIRCLE_PROJECT_USERNAME,
-	CIRCLE_SHA1
+	CIRCLE_SHA1,
+	CIRCLE_WORKFLOW_ID
 } = process.env;
 
 notifyCircleStatus();
@@ -66,6 +71,14 @@ async function notifyCircleStatus() {
 	}
 
 	const jobData = await getJobData();
+	const buildUrl = [
+		'https://app.circleci.com/pipelines/github',
+		CIRCLE_PROJECT_USERNAME,
+		CIRCLE_PROJECT_REPONAME,
+		CKE5_PIPELINE_NUMBER,
+		'workflows',
+		CIRCLE_WORKFLOW_ID
+	].join( '/' );
 
 	const message = await formatMessage( {
 		slackMessageUsername: 'Circle CI',
@@ -73,8 +86,9 @@ async function notifyCircleStatus() {
 		repositoryOwner: CIRCLE_PROJECT_USERNAME,
 		repositoryName: CIRCLE_PROJECT_REPONAME,
 		branch: CIRCLE_BRANCH,
-		jobUrl: CIRCLE_BUILD_URL,
-		jobId: CIRCLE_BUILD_NUM,
+		buildTitle: 'Workflow ID',
+		buildUrl,
+		buildId: CIRCLE_WORKFLOW_ID.split( '-' )[ 0 ] + '-...',
 		githubToken: CKE5_GITHUB_TOKEN,
 		triggeringCommitUrl: getTriggeringCommitUrl(),
 		startTime: Math.ceil( ( new Date( jobData.started_at ) ).getTime() / 1000 ),
@@ -109,8 +123,8 @@ function getTriggeringCommitUrl() {
 	let repoSlug, hash;
 
 	if ( CKE5_TRIGGER_REPOSITORY_SLUG && CKE5_TRIGGER_COMMIT_HASH ) {
-		repoSlug = CKE5_TRIGGER_REPOSITORY_SLUG;
-		hash = CKE5_TRIGGER_COMMIT_HASH;
+		repoSlug = CKE5_TRIGGER_REPOSITORY_SLUG.trim();
+		hash = CKE5_TRIGGER_COMMIT_HASH.trim();
 	} else {
 		repoSlug = [ CIRCLE_PROJECT_USERNAME, CIRCLE_PROJECT_REPONAME ].join( '/' );
 		hash = CIRCLE_SHA1;

package/bin/notify-travis-status.js

@@ -97,8 +97,9 @@ async function notifyTravisStatus() {
 		repositoryOwner,
 		repositoryName,
 		branch: TRAVIS_BRANCH,
-		jobUrl: TRAVIS_JOB_WEB_URL,
-		jobId: TRAVIS_JOB_NUMBER,
+		buildTitle: 'Job number',
+		buildUrl: TRAVIS_JOB_WEB_URL,
+		buildId: '#' + TRAVIS_JOB_NUMBER,
 		githubToken: GITHUB_TOKEN,
 		triggeringCommitUrl: SLACK_NOTIFY_COMMIT_URL || `https://github.com/${ TRAVIS_REPO_SLUG }/commit/${ TRAVIS_COMMIT }`,
 		startTime: Number( START_TIME ),

package/lib/format-message.js

@@ -20,8 +20,9 @@ const REPOSITORY_REGEXP = /github\.com\/([^/]+)\/([^/]+)/;
  * @param {String} repositoryOwner
  * @param {String} repositoryName
  * @param {String} branch
- * @param {String} jobUrl
- * @param {String} jobId
+ * @param {String} buildTitle
+ * @param {String} buildUrl
+ * @param {String} buildId
  * @param {String} githubToken
  * @param {String} triggeringCommitUrl
  * @param {Number} startTime
@@ -44,8 +45,8 @@ module.exports = async function formatMessage( options ) {
 				value: `<${ repoUrl }|${ options.repositoryName }> (<${ repoUrl }/tree/${ options.branch }|${ options.branch }>)`,
 				short: true
 			}, {
-				title: 'Build number',
-				value: `<${ options.jobUrl }|#${ options.jobId }>`,
+				title: options.buildTitle,
+				value: `<${ options.buildUrl }|${ options.buildId }>`,
 				short: true
 			}, {
 				title: 'Commit',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-dev-ci",
-  "version": "38.1.0",
+  "version": "38.1.2",
   "description": "Utils for CKEditor5 CI builds.",
   "keywords": [],
   "dependencies": {