Skip to content

Commit

Permalink
Merge pull request #400 from Ableton/rco/prepare-to-change-default-br…
Browse files Browse the repository at this point in the history
…anch

Change default branch from master to main
  • Loading branch information
rco-ableton committed Dec 13, 2023
2 parents 3305034 + d6dd050 commit a70ac71
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .jenkins.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
pull_requests:
- master
- main

pushes:
- master
- main

notifications:
- name: Build failures on the main branch
branch: master
branch: main
slack:
- GJUMRCZKQ
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ the following criteria:
- The code is well-formatted.
* Please see the linting checks in the `test` section of the
[Jenkinsfile][jenkinsfile]).


[cla]: http://ableton.github.io/cla/
[jenkinsfile]: https://github.com/AbletonDevTools/groovylint/blob/master/Jenkinsfile
[jenkinsfile]: https://github.com/AbletonDevTools/groovylint/blob/main/Jenkinsfile
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ library "groovylint@${params.JENKINS_COMMIT}"


devToolsProject.run(
defaultBranch: 'master',
defaultBranch: 'main',
setup: { data ->
data['venv'] = pyenv.createVirtualEnv(readFile('.python-version'))
data.venv.run('pip install -r requirements-dev.txt')
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ $ /path/to/run_codenarc.py --resources /path/to/groovylint/resources \

To assist in linting on Jenkins, `groovylint` provides a pipeline library and global
singleton. To use `groovylint` in this manner, you'll need to add it to your [Jenkins
master configuration][jenkins-lib-config]. Any `Jenkinsfile` which is using this library
should also use the version tag, like so:
controller configuration][jenkins-lib-config]. Any `Jenkinsfile` which is using this
library should also use the version tag, like so:

```groovy
// Example Jenkinsfile using a scripted pipeline
Expand All @@ -126,10 +126,10 @@ corresponding Docker image for that release.

In order to ensure that the library is using a compatible version of the Docker image, a
file named `VERSION` exists in the top-level directory of this project. To make a release,
this file should be updated accordingly and the commit merged to the `master` branch.
this file should be updated accordingly and the commit merged to the `main` branch.
Please also update the groovylint version in `pom.xml`.

Once on `master`, a new Docker image will be published by Ableton's CI service, which will
Once on `main`, a new Docker image will be published by Ableton's CI service, which will
also push a corresponding git tag to the origin and update the respective `major.minor`
branch.

Expand Down

0 comments on commit a70ac71

Please sign in to comment.