You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .ci/Jenkinsfile
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -32,7 +32,7 @@ pipeline {
32
32
}
33
33
parameters {
34
34
booleanParam(name: 'run_all_stages', defaultValue: false, description: 'Force to run all stages.')
35
-
booleanParam(name: 'release', defaultValue: false, description: 'Release. If so, all the other parameters will be ignored when releasing from master.')
35
+
booleanParam(name: 'release', defaultValue: false, description: 'Release. If so, all the other parameters will be ignored when releasing from main.')
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+7-7Lines changed: 7 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -38,7 +38,7 @@ Once your changes are ready to submit for review:
38
38
3. Rebase your changes
39
39
40
40
Update your local repository with the most recent code from the main repo,
41
-
and rebase your branch on top of the latest master branch. We prefer your
41
+
and rebase your branch on top of the latest main branch. We prefer your
42
42
initial changes to be squashed into a single commit. Later, if we ask you to
43
43
make changes, add them as separate commits. This makes it easier to review.
44
44
As a final step before merging, we will either ask you to squash all commits
@@ -60,14 +60,14 @@ Once your changes are ready to submit for review:
60
60
61
61
### Workflow
62
62
63
-
All feature development and most bug fixes hit the master branch first.
63
+
All feature development and most bug fixes hit the main branch first.
64
64
Pull requests should be reviewed by someone with commit access. Once approved,
65
65
the author of the pull request, or reviewer if the author does not have commit
66
66
access, should "Squash and merge".
67
67
68
68
Before submitting a pull request, please make sure to follow the below steps
69
69
70
-
1. Fork the repo and create your branch from `master`.
70
+
1. Fork the repo and create your branch from `main`.
71
71
72
72
2. We use `npm` for running development scripts.
73
73
@@ -146,19 +146,19 @@ We run end to end tests for the Synthetics agent itself, as well as the Elastic
146
146
147
147
If you have access to publish the package to NPM, the process is as follows:
148
148
149
-
1. Be sure you have checked out the `master` branch and have pulled the latest changes
149
+
1. Be sure you have checked out the `main` branch and have pulled the latest changes
150
150
1. Run the tests to make sure everything is green
151
151
1. Bump the beta version by running `npm version prerelease --preid=beta`
152
-
1. Push commits and tags upstream with `git push upstream master && git push upstream --tags`
152
+
1. Push commits and tags upstream with `git push upstream main && git push upstream --tags`
153
153
1. Publish to NPM using with `npm publish --tag beta`
154
154
1. Mark the last published beta tags as latest using `npm dist-tag add @elastic/synthetics@<$VERSION> latest`
155
155
156
156
#### CI based
157
157
158
-
The release process is also automated in the way any specific commit from the master branch can be potentially released, for such it's required the below steps:
158
+
The release process is also automated in the way any specific commit from the main branch can be potentially released, for such it's required the below steps:
159
159
160
160
1. Login to apm-ci.elastic.co
161
-
1. Go to the [master](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/master/) pipeline.
161
+
1. Go to the [main](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/main/) pipeline.
162
162
1. Click on `Build with parameters` with the below checkbox:
Copy file name to clipboardExpand all lines: __tests__/e2e/README.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -16,7 +16,7 @@ nvm use
16
16
```
17
17
18
18
### Go
19
-
We depend on Go to install Elastic Package. The go version depdendency is documented by Elastic Package: https://github.com/elastic/elastic-package/blob/master/.go-version
19
+
We depend on Go to install Elastic Package. The go version depdendency is documented by Elastic Package: https://github.com/elastic/elastic-package/blob/main/.go-version
0 commit comments