Skip to content

Commit 49b4185

Browse files
kabalinstronk7
authored andcommitted
Fix release URL and release docs.
1 parent 11f03f7 commit 49b4185

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

docs/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ No unreleased changes.
281281
- `moodle-plugin-ci csslint` command. Lints the CSS files in the plugin.
282282

283283
[Unreleased]: https://github.com/moodlehq/moodle-plugin-ci/compare/3.0.0...master
284+
[3.0.1]: https://github.com/moodlehq/moodle-plugin-ci/compare/3.0.0...3.0.1
284285
[3.0.0]: https://github.com/moodlehq/moodle-plugin-ci/compare/2.5.0...3.0.0
285286
[2.5.0]: https://github.com/moodlehq/moodle-plugin-ci/compare/2.4.0...2.5.0
286287
[2.4.0]: https://github.com/moodlehq/moodle-plugin-ci/compare/2.3.0...2.4.0

docs/ReleaseNewVersion.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,23 @@ Prior to tagging a release, ensure the following have been updated:
1313
* If this is a new major version, then the `.travis.dist.yml` and `doc/TravisFileExplained.md` need to be updated
1414
to use the new major version. Any other version will automatically be used.
1515

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

19-
Once all code and commits are in place and verified, you need to tag a release.
23+
Once all code and commits are in place and verified, you need to tag a
24+
release.
2025

2126
There are two options: you can tag `master` branch `HEAD` and push using commands:
2227

2328
```bash
2429
$ git tag -a 3.1.0 -m "Release version 3.1.0"
2530
$ git push origin 3.1.0
2631
```
32+
2733
Alternatively, you can use GitHub interface to tag: click "Draft a new release" and specify
2834
tag using the interface (you can leave title field empty, tag will be used as
2935
title in this case) and click "Publish release".
@@ -35,6 +41,10 @@ to the latest release "assets" on GitHub. Verify it has worked correctly by
3541
navigating at
3642
[Releases](https://github.com/moodlehq/moodle-plugin-ci/releases).
3743

44+
__Note:__ Before triggering tag build, make sure that Travis is not running any
45+
builds, otherwise tag build might not get triggered. If this happenened, you
46+
need to remove tag and push it again when Travis is not busy.
47+
3848
If there is any problem with that automatic deployment, the artifact will need to be created manually. First build PHAR file manually:
3949

4050
```bash

0 commit comments

Comments
 (0)