Skip to content

Commit 27e7c5a

Browse files
committed
Move all "master" uses to "main"
The canonical repository https://github.com/moodlehq/moodle-plugin-ci has moved its "master" branch to "main". So, here, we are adjusting all the places where the, now old, "master" branch was being used. Usually that includes: - CI Integrations (GHA, Travis...). - Docs: READMEs, change logs, comments, any link pointing to "master" in general. - Cases in code base that may depend of git branch name (unlikely, but...)
1 parent 693a638 commit 27e7c5a

File tree

13 files changed

+41
-40
lines changed

13 files changed

+41
-40
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
matrix:
7676
include:
7777
- php: '8.2'
78-
moodle-branch: 'master'
78+
moodle-branch: 'main'
7979
- php: '8.2'
8080
moodle-branch: 'MOODLE_403_STABLE'
8181
- php: '8.2'
@@ -194,7 +194,7 @@ jobs:
194194
include:
195195
# Each supported PHP version once. That's enough.
196196
- php: '8.2'
197-
moodle-branch: 'master'
197+
moodle-branch: 'main'
198198
- php: '8.1'
199199
moodle-branch: 'MOODLE_403_STABLE'
200200
- php: '8.0'

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ jobs:
8888

8989
- stage: Integration tests
9090
if: env(MOODLE_BRANCH) IS present
91-
# Only master with highest supported PHP version.
91+
# Only main with highest supported PHP version.
9292
- php: 8.2
93-
env: MOODLE_BRANCH=master
93+
env: MOODLE_BRANCH=main
9494
# Last stable with highest supported PHP version.
9595
- php: 8.2
9696
env: MOODLE_BRANCH=MOODLE_402_STABLE

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Latest Stable Version](https://poser.pugx.org/moodlehq/moodle-plugin-ci/v)](//packagist.org/packages/moodlehq/moodle-plugin-ci)
2-
![Moodle Plugin CI](https://github.com/moodlehq/moodle-plugin-ci/workflows/Moodle%20Plugin%20CI/badge.svg)
3-
[![Build Status](https://travis-ci.com/moodlehq/moodle-plugin-ci.svg?branch=master)](https://travis-ci.com/moodlehq/moodle-plugin-ci)
4-
[![codecov](https://codecov.io/gh/moodlehq/moodle-plugin-ci/branch/master/graph/badge.svg?token=I3PPJ383G7)](https://codecov.io/gh/moodlehq/moodle-plugin-ci)
2+
[![Moodle Plugin CI](https://github.com/moodlehq/moodle-plugin-ci/actions/workflows/test.yml/badge.svg)](https://github.com/moodlehq/moodle-plugin-ci/actions/workflows/test.yml)
3+
[![Build Status](https://app.travis-ci.com/moodlehq/moodle-plugin-ci.svg?branch=main)](https://app.travis-ci.com/github/moodlehq/moodle-plugin-ci)
4+
[![codecov](https://codecov.io/gh/moodlehq/moodle-plugin-ci/branch/main/graph/badge.svg?token=I3PPJ383G7)](https://codecov.io/gh/moodlehq/moodle-plugin-ci)
55
[![Total Downloads](https://poser.pugx.org/moodlehq/moodle-plugin-ci/downloads)](//packagist.org/packages/moodlehq/moodle-plugin-ci)
66
[![License](https://poser.pugx.org/moodlehq/moodle-plugin-ci/license)](//packagist.org/packages/moodlehq/moodle-plugin-ci)
77

@@ -31,3 +31,4 @@ Many, many thanks to all the collaborators, very specially to **Mark Nielsen** f
3131
making this product such a great tool for the entire **Moodle development community**, we'll try to keep the bar high!
3232

3333
And, of course, everybody is welcome to participate and help here, it's **Open Source**, you know!
34+
/

docs/AddExtraPlugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You may add as many plugins as you like, by simply calling the `add-plugin` comm
1616
command takes a single argument and that is your GitHub account name and the project name. So, in the example, it
1717
would clone `https://github.com/moodlehq/moodle-local_hub.git`.
1818

19-
By default, the branch that is cloned is the `master` branch. You can use the `--branch` (`-b`) option to override
19+
If not specified, the default branch of the repository is used (normally `main`). You can use the `--branch` (`-b`) option to override
2020
this behavior. If you use the same branch names as Moodle (EG: `MOODLE_XY_STABLE`), then a handy trick is to pass
2121
the `$MOODLE_BRANCH` build variable to the `add-plugin` command. Here is an example:
2222

docs/CHANGELOG.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
2121
php: error while loading shared libraries: libonig.so.5
2222
```
2323

24-
To avoid that problem it's recommended to to add the `libonig5` package to the `travis.yml` file. For a working example, please reference the updated `.travis.dist.yml`file.
24+
To avoid that problem, it's recommended to to add the `libonig5` package to the `travis.yml` file. For a working example, please reference the updated `.travis.dist.yml`file.
2525

2626
## [4.1.8] - 2023-10-20
2727
### Changed
@@ -164,18 +164,18 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
164164

165165
### Fixed
166166
- Updated to `php-coveralls/php-coveralls` v2 for uploading coverage results to [Coveralls](https://coveralls.io) with the `coveralls-upload` command.
167-
- ACTION REQUIRED: Review any use of the `coveralls-upload` command in GHA and ensure that `COVERALLS_REPO_TOKEN` is set in the environment. See [Coveralls integration](https://github.com/moodlehq/moodle-plugin-ci/blob/master/docs/CodeCoverage.md#coveralls-integration) for more information.
167+
- ACTION REQUIRED: Review any use of the `coveralls-upload` command in GHA and ensure that `COVERALLS_REPO_TOKEN` is set in the environment. See [Coveralls integration](https://github.com/moodlehq/moodle-plugin-ci/blob/main/docs/CodeCoverage.md#coveralls-integration) for more information.
168168

169169
## [3.4.4] - 2023-01-20
170170
### Changed
171171
- Updated to `php-compatibility` dev version. This was needed because the last release is from 2019 and, until a new release is available, it was the only way to get it working with PHP 8.1 and above and some good new Sniffs incorporated.
172172

173173
## [3.4.3] - 2022-12-24
174174
### Changed
175-
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml) and
176-
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
175+
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/gha.dist.yml) and
176+
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml)
177177
(and documentation) to fulfil [Moodle 4.2 new requirements](https://tracker.moodle.org/browse/MDL-74905).
178-
- ACTION REQUIRED: Review existing integrations running tests against master (4.2dev). There are a few Moodle 4.2 new requirements:
178+
- ACTION REQUIRED: Review existing integrations running tests against main (4.2dev). There are a few Moodle 4.2 new requirements:
179179
- PHP 8.0 is required (instead of 7.4).
180180
- PostgreSQL 13 is required (instead of 12).
181181
- MariaDB 10.6 is required (instead of 10.4).
@@ -198,10 +198,10 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
198198
- `moodle-plugin-ci install` now provides an option `--db-port` to define a custom database port.
199199

200200
### Changed
201-
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml) and
202-
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
201+
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/gha.dist.yml) and
202+
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml)
203203
(and documentation) to fulfil [Moodle 4.1 new requirements](https://tracker.moodle.org/browse/MDL-71747).
204-
- ACTION REQUIRED: Review existing integrations running tests against master (4.1dev). There are a few Moodle 4.1 new requirements:
204+
- ACTION REQUIRED: Review existing integrations running tests against main (4.1dev). There are a few Moodle 4.1 new requirements:
205205
- PHP 7.4 is required (instead of 7.3).
206206
- PostgreSQL 12 is required (instead of 10). Pay special attention to the changes needed for this and Travis!
207207
- MariaDB 10.4 is required (instead of 10.2.29).
@@ -229,7 +229,7 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
229229
## [3.2.5] - 2022-03-31
230230
### Changed
231231
- ACTION SUGGESTED: Now, it's safe to 'unpin' the MariaDB version in all integrations. With MariaDB 10.6.7 and 10.7.3 already released, the existing problems are gone, so it's possible to move away from the older 10.5 version. To achieve that, just look for any use of `image: mariadb:10.5` and change it to `image: mariadb:10`. For more information, see [MDL-72131](https://tracker.moodle.org/browse/MDL-72131).
232-
- Updated version of [moodle-local_codechecker](https://github.com/moodlehq/moodle-local_codechecker) to v3.1.0. For list of changes see [changelog](https://github.com/moodlehq/moodle-local_codechecker/blob/master/CHANGES.md#changes-in-version-310-20220225---fondant-chocolate), you should expect numerous `@covers` annotation warnings in particular.
232+
- Updated version of [moodle-local_codechecker](https://github.com/moodlehq/moodle-local_codechecker) to v3.1.0. For list of changes see [changelog](https://github.com/moodlehq/moodle-local_codechecker/blob/main/CHANGES.md#changes-in-version-310-20220225---fondant-chocolate), you should expect numerous `@covers` annotation warnings in particular.
233233

234234
### Added
235235
- Use utf8mb4 for MySQL and MariaDB setup.
@@ -267,8 +267,8 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
267267
- New tool-agnostic `CI_BUILD_DIR` env. variable that can be used instead of the old `TRAVIS_BUILD_DIR` one. Note that support for the later [will be removed](https://github.com/moodlehq/moodle-plugin-ci/issues/118) at some point in the future.
268268

269269
### Changed
270-
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml) and
271-
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
270+
- Updated [gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/gha.dist.yml) and
271+
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml)
272272
to use PostgreSQL 10 (Moodle 4.0 new requirement).
273273
- ACTION REQUIRED: Existing integrations running tests with PostgreSQL now need to use version 10 or newer.
274274
- ACTION REQUIRED: Existing integrations running tests with MariaDB must avoid using the 10.6 version and use 10.5 instead. It comes with some changes making it incompatible with Moodle default installation. To achieve that, just look for any use of `image: mariadb:10` and change it to `image: mariadb:10.5`. This is being tracked @ [MDL-72131]( https://tracker.moodle.org/browse/MDL-72131) and, once fixed, it will be possible to go back to the original image.
@@ -283,8 +283,8 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
283283
only if adding PHP 8 jobs. These changes include 1) Setting up the `max_input_vars=5000`
284284
PHP configuration setting, for all runs, and 2) Enabling the `xmlrpc-beta` extension
285285
if the plugin requires xmlrpc services, only for PHP 8 runs. See
286-
[gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml) and
287-
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml) for more information.
286+
[gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/gha.dist.yml) and
287+
[.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml) for more information.
288288

289289
### Changed
290290
- Updated various internal dependencies and tools.
@@ -311,12 +311,12 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
311311
- ACTION REQUIRED: If you are using GitHub Actions, add `NVM_DIR` definition
312312
in "Initialise moodle-plugin-ci" step. Without it `nvm` can't be used for
313313
node version switching, see the step definition at
314-
[gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml)
314+
[gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/gha.dist.yml)
315315
and add missing `NVM_DIR` line your plugin's GHA workflow file.
316316

317317
### Changed
318318
- `moodle-plugin-ci add-plugin` command now uses default banch to checkout
319-
instead of `master` if `--branch` param is not specified..
319+
instead of `main` if `--branch` param is not specified..
320320

321321
## [3.0.4] - 2021-01-29
322322
### Fixed
@@ -333,7 +333,7 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
333333

334334
### Added
335335
- Detect existence of legacy php-webdriver, and use a different Firefox image when it is in use.
336-
- Add [manual](https://github.com/moodlehq/moodle-plugin-ci/blob/master/docs/index.md) and [example](https://github.com/moodlehq/moodle-plugin-ci/blob/master/docs/GHAFileExplained.md) on using GitHub Actions as CI tool.
336+
- Add [manual](https://github.com/moodlehq/moodle-plugin-ci/blob/main/docs/index.md) and [example](https://github.com/moodlehq/moodle-plugin-ci/blob/main/docs/GHAFileExplained.md) on using GitHub Actions as CI tool.
337337

338338
## [3.0.3] - 2020-10-16
339339
### Changed
@@ -616,7 +616,7 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
616616
- `moodle-plugin-ci shifter` command. Run YUI Shifter on plugin YUI modules.
617617
- `moodle-plugin-ci csslint` command. Lints the CSS files in the plugin.
618618

619-
[Unreleased]: https://github.com/moodlehq/moodle-plugin-ci/compare/4.1.8...master
619+
[Unreleased]: https://github.com/moodlehq/moodle-plugin-ci/compare/4.1.8...main
620620
[4.1.8]: https://github.com/moodlehq/moodle-plugin-ci/compare/4.1.7...4.1.8
621621
[4.1.7]: https://github.com/moodlehq/moodle-plugin-ci/compare/4.1.6...4.1.7
622622
[4.1.6]: https://github.com/moodlehq/moodle-plugin-ci/compare/4.1.5...4.1.6
@@ -681,4 +681,4 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
681681
[1.3.0]: https://github.com/moodlehq/moodle-plugin-ci/compare/1.2.0...1.3.0
682682
[1.2.0]: https://github.com/moodlehq/moodle-plugin-ci/compare/1.1.0...1.2.0
683683
[1.1.0]: https://github.com/moodlehq/moodle-plugin-ci/compare/1.0.0...1.1.0
684-
[.travis.dist.yml]: https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml
684+
[.travis.dist.yml]: https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml

docs/GHAFileExplained.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: GitHub Actions CI workflow file explained
44
---
55

66
Below is the
7-
[gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/gha.dist.yml)
7+
[gha.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/gha.dist.yml)
88
file with comments added to explain what each section is doing. For additional
99
information please refer to [workflow syntax reference](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions).
1010

docs/ReleaseNewVersion.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ Prior to tagging a release, ensure the following have been updated:
1818
Any other version will automatically be used.
1919

2020
When all the changes above have been performed, push them straight upstream to
21-
`master` or create a standard PR to get them reviewed and incorporated
21+
`main` or create a standard PR to get them reviewed and incorporated
2222
upstream. In the latter case, use your repo clone for PR - this way Packagist
2323
will not capture new branch in the list of tags and you will not end up having
2424
double CI build on Travis, also when merging PR, please **avoid merge commit**
2525
(use "Rebase and merge" option).
2626

2727
Once all code and commits are in place and verified, you need to tag a
28-
release. Tag `master` branch `HEAD` and push using commands:
28+
release. Tag `main` branch `HEAD` and push using commands:
2929

3030
```bash
3131
$ git tag -a 4.0.8 -m "Release version 4.0.8"

docs/TravisFileExplained.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: page
33
title: Travis CI file explained
44
---
55

6-
Below is the [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
6+
Below is the [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml)
77
file but with comments added to explain what each section is doing. For additional help,
88
see [Travis CI's documentation](http://docs.travis-ci.com/user/getting-started/).
99

docs/UPGRADE-2.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Requirements have changed, this project now requires PHP 5.6 or later and Moodle
1313

1414
Detailed information about what changed in Version 2 can be found in the [change log](CHANGELOG.md).
1515

16-
## Step 3: Review the Travis CI configuration file
16+
## Step 3: Review the Travis CI configuration file
1717

18-
Review the updated [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
18+
Review the updated [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml)
1919
and update your `.travis.yml` file in your plugin. For detailed information about the contents of `.travis.dist.yml`
2020
file, please see this [help document](TravisFileExplained.md). **Please carefully** review the updated
2121
`.travis.dist.yml` as some steps have been removed and others added, like installation of Java 8,

docs/UPGRADE-3.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Detailed information about what changed in Version 3 can be found in the [change
1515

1616
## Step 3: Review the Travis CI configuration file
1717

18-
Review the updated [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml)
18+
Review the updated [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/main/.travis.dist.yml)
1919
and update your `.travis.yml` file in your plugin. For detailed information about the contents of `.travis.dist.yml`
2020
file, please see this [help document](TravisFileExplained.md). **Please carefully** review the updated
2121
`.travis.dist.yml` as some steps have been removed (like installation of Java 8, installing of NodeJS, etc.) and others added.

0 commit comments

Comments
 (0)