fix: use CI_PROJECT_PATH for GitLab slug

semantic-release · Jan 27, 2018 · acd3f54 · acd3f54
1 parent 9d2fc5a
commit acd3f54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git a/lib/gitlab.js b/lib/gitlab.js
@@ -11,12 +11,7 @@ module.exports = {
  build: process.env.CI_JOB_NAME,
  job: process.env.CI_JOB_STAGE,
  branch: process.env.CI_COMMIT_REF_NAME,
- slug: process.env.CI_REPOSITORY_URL
- ? process.env.CI_REPOSITORY_URL.split('/')
- .slice(3, 5)
- .join('/')
- .replace('.git', '')
- : undefined,
+ slug: process.env.CI_PROJECT_PATH,
  root: process.env.CI_PROJECT_DIR,
  };
  },

diff --git a/test/gitlab.test.js b/test/gitlab.test.js
@@ -7,7 +7,7 @@ test('Push', t => {
  process.env.CI_JOB_NAME = '91011';
  process.env.CI_JOB_STAGE = '1234';
  process.env.CI_COMMIT_REF_NAME = 'master';
- process.env.CI_REPOSITORY_URL = 'https://gitlab.com/owner/repo.git';
+ process.env.CI_PROJECT_PATH = 'owner/repo';
  process.env.CI_PROJECT_DIR = '/';
 
  t.deepEqual(gitlab.configuration(), {
@@ -20,23 +20,3 @@ test('Push', t => {
  slug: 'owner/repo',
  });
 });
-
-test('Push (no repo url)', t => {
- process.env.GITLAB_CI = 'true';
- process.env.CI_COMMIT_SHA = '5678';
- process.env.CI_JOB_NAME = '91011';
- process.env.CI_JOB_STAGE = '1234';
- process.env.CI_COMMIT_REF_NAME = 'master';
- process.env.CI_PROJECT_DIR = '/';
- delete process.env.CI_REPOSITORY_URL;
-
- t.deepEqual(gitlab.configuration(), {
- service: 'gitlab',
- commit: '5678',
- build: '91011',
- branch: 'master',
- root: '/',
- job: '1234',
- slug: undefined,
- });
-});