Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the merge request branch on merge requests #1687

Merged
merged 3 commits into from
Sep 17, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Replace references to CI_COMMIT_BRANCH
  • Loading branch information
Carl Allen committed Sep 16, 2021
commit 1b5a719d997a0e8b98f50c1fe4c0b5723f346d50
32 changes: 16 additions & 16 deletions spec/datadog/ci/ext/fixtures/ci/gitlab.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -31,7 +31,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -63,7 +63,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -95,7 +95,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -127,7 +127,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -161,7 +161,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -195,7 +195,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -229,7 +229,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -261,7 +261,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -291,7 +291,7 @@
],
[
{
"CI_COMMIT_BRANCH": "refs/heads/master",
"CI_COMMIT_REF_NAME": "refs/heads/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -323,7 +323,7 @@
],
[
{
"CI_COMMIT_BRANCH": "refs/heads/feature/one",
"CI_COMMIT_REF_NAME": "refs/heads/feature/one",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -451,7 +451,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -483,7 +483,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -515,7 +515,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -547,7 +547,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down Expand Up @@ -579,7 +579,7 @@
],
[
{
"CI_COMMIT_BRANCH": "origin/master",
"CI_COMMIT_REF_NAME": "origin/master",
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
"CI_COMMIT_SHA": "gitlab-git-commit",
"CI_JOB_NAME": "gitlab-job-name",
Expand Down