Skip to content

Commit 591d7b2

Browse files
kira-mkira-m
authored
Merge pull request #1086 from CircleCI-Public/update-main
[LIFE-810] Update main
2 parents 77b1f51 + 72cff49 commit 591d7b2

File tree

3 files changed

+78
-9
lines changed

3 files changed

+78
-9
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ The tool is deployed through a number of channels. The primary release channel i
156156

157157
### Homebrew
158158

159-
We publish the tool to [Homebrew](https://brew.sh/). The tool is [part of `homebrew-core`](https://github.com/Homebrew/homebrew-core/blob/main/Formula/circleci.rb), and therefore the maintainers of the tool are obligated to follow the guidelines for acceptable Homebrew formulae. You should [familairise yourself with the guidelines](https://docs.brew.sh/Acceptable-Formulae#we-dont-like-tools-that-upgrade-themselves) before making changes to the Homebrew deployment system.
159+
We publish the tool to [Homebrew](https://brew.sh/). The tool is [part of `homebrew-core`](https://github.com/Homebrew/homebrew-core/blob/main/Formula/circleci.rb), and therefore the maintainers of the tool are obligated to follow the guidelines for acceptable Homebrew formulae. You should [familiarize yourself with the guidelines](https://docs.brew.sh/Acceptable-Formulae#we-dont-like-tools-that-upgrade-themselves) before making changes to the Homebrew deployment system.
160160

161161
The particular considerations that we make are:
162162

‎config/pipeline.go‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,37 @@ func LocalPipelineValues(parameters Parameters) Values {
3232
}
3333

3434
vals := map[string]interface{}{
35-
"pipeline.id": "00000000-0000-0000-0000-000000000001",
36-
"pipeline.number": 1,
37-
"pipeline.project.git_url": gitUrl,
38-
"pipeline.project.type": projectType,
39-
"pipeline.git.tag": git.Tag(),
40-
"pipeline.git.branch": git.Branch(),
41-
"pipeline.git.revision": revision,
42-
"pipeline.git.base_revision": revision,
35+
"pipeline.id": "00000000-0000-0000-0000-000000000001",
36+
"pipeline.number": 1,
37+
"pipeline.project.git_url": gitUrl,
38+
"pipeline.project.type": projectType,
39+
"pipeline.git.tag": git.Tag(),
40+
"pipeline.git.branch": git.Branch(),
41+
"pipeline.git.revision": revision,
42+
"pipeline.git.base_revision": revision,
43+
"pipeline.git.branch.is_default": false,
44+
"pipeline.trigger_parameters.circleci.event_time": "2020-01-01T00:00:00Z",
45+
"pipeline.trigger_parameters.webhook.body": "",
46+
"pipeline.trigger_parameters.github_app.branch": "main",
47+
"pipeline.trigger_parameters.github_app.checkout_sha": revision,
48+
"pipeline.trigger_parameters.github_app.commit_sha": revision,
49+
"pipeline.trigger_parameters.github_app.commit_title": "",
50+
"pipeline.trigger_parameters.github_app.commit_message": "",
51+
"pipeline.trigger_parameters.github_app.commit_timestamp": "2020-01-01T00:00:00Z",
52+
"pipeline.trigger_parameters.github_app.commit_author_name": "",
53+
"pipeline.trigger_parameters.github_app.ref": "refs/heads/master",
54+
"pipeline.trigger_parameters.github_app.repo_name": "",
55+
"pipeline.trigger_parameters.github_app.repo_url": "",
56+
"pipeline.trigger_parameters.github_app.total_commits_count": 1,
57+
"pipeline.trigger_parameters.github_app.user_avatar": "",
58+
"pipeline.trigger_parameters.github_app.user_id": "00000000-0000-0000-0000-000000000001",
59+
"pipeline.trigger_parameters.github_app.user_name": "",
60+
"pipeline.trigger_parameters.github_app.user_username": "",
61+
"pipeline.trigger_parameters.github_app.web_url": "",
62+
"pipeline.trigger_parameters.gitlab.commit_sha": revision,
63+
"pipeline.trigger_parameters.gitlab.default_branch": "main",
64+
"pipeline.trigger_parameters.gitlab.x_gitlab_event_id": "00000000-0000-0000-0000-000000000001",
65+
"pipeline.trigger_parameters.gitlab.is_fork_merge_request": false,
4366
}
4467

4568
for k, v := range parameters {

‎config/pipeline_test.go‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,29 @@ func TestLocalPipelineValues(t *testing.T) {
2525
"pipeline.git.branch",
2626
"pipeline.git.revision",
2727
"pipeline.git.base_revision",
28+
"pipeline.git.branch.is_default",
29+
"pipeline.trigger_parameters.circleci.event_time",
30+
"pipeline.trigger_parameters.webhook.body",
31+
"pipeline.trigger_parameters.github_app.branch",
32+
"pipeline.trigger_parameters.github_app.checkout_sha",
33+
"pipeline.trigger_parameters.github_app.commit_sha",
34+
"pipeline.trigger_parameters.github_app.commit_title",
35+
"pipeline.trigger_parameters.github_app.commit_message",
36+
"pipeline.trigger_parameters.github_app.commit_timestamp",
37+
"pipeline.trigger_parameters.github_app.commit_author_name",
38+
"pipeline.trigger_parameters.github_app.ref",
39+
"pipeline.trigger_parameters.github_app.repo_name",
40+
"pipeline.trigger_parameters.github_app.repo_url",
41+
"pipeline.trigger_parameters.github_app.total_commits_count",
42+
"pipeline.trigger_parameters.github_app.user_avatar",
43+
"pipeline.trigger_parameters.github_app.user_id",
44+
"pipeline.trigger_parameters.github_app.user_name",
45+
"pipeline.trigger_parameters.github_app.user_username",
46+
"pipeline.trigger_parameters.github_app.web_url",
47+
"pipeline.trigger_parameters.gitlab.commit_sha",
48+
"pipeline.trigger_parameters.gitlab.default_branch",
49+
"pipeline.trigger_parameters.gitlab.x_gitlab_event_id",
50+
"pipeline.trigger_parameters.gitlab.is_fork_merge_request",
2851
},
2952
},
3053
{
@@ -41,6 +64,29 @@ func TestLocalPipelineValues(t *testing.T) {
4164
"pipeline.git.base_revision",
4265
"pipeline.parameters.foo",
4366
"pipeline.parameters.baz",
67+
"pipeline.git.branch.is_default",
68+
"pipeline.trigger_parameters.circleci.event_time",
69+
"pipeline.trigger_parameters.webhook.body",
70+
"pipeline.trigger_parameters.github_app.branch",
71+
"pipeline.trigger_parameters.github_app.checkout_sha",
72+
"pipeline.trigger_parameters.github_app.commit_sha",
73+
"pipeline.trigger_parameters.github_app.commit_title",
74+
"pipeline.trigger_parameters.github_app.commit_message",
75+
"pipeline.trigger_parameters.github_app.commit_timestamp",
76+
"pipeline.trigger_parameters.github_app.commit_author_name",
77+
"pipeline.trigger_parameters.github_app.ref",
78+
"pipeline.trigger_parameters.github_app.repo_name",
79+
"pipeline.trigger_parameters.github_app.repo_url",
80+
"pipeline.trigger_parameters.github_app.total_commits_count",
81+
"pipeline.trigger_parameters.github_app.user_avatar",
82+
"pipeline.trigger_parameters.github_app.user_id",
83+
"pipeline.trigger_parameters.github_app.user_name",
84+
"pipeline.trigger_parameters.github_app.user_username",
85+
"pipeline.trigger_parameters.github_app.web_url",
86+
"pipeline.trigger_parameters.gitlab.commit_sha",
87+
"pipeline.trigger_parameters.gitlab.default_branch",
88+
"pipeline.trigger_parameters.gitlab.x_gitlab_event_id",
89+
"pipeline.trigger_parameters.gitlab.is_fork_merge_request",
4490
},
4591
},
4692
}

0 commit comments

Comments
 (0)