Skip to content

Commit

Permalink
Merge pull request #25 from geoadmin/develop
Browse files Browse the repository at this point in the history
New Release v1.1.0
  • Loading branch information
ltshb authored Nov 17, 2021
2 parents fd5fe2f + 4e6ec91 commit fe9f37f
Show file tree
Hide file tree
Showing 8 changed files with 187 additions and 130 deletions.
17 changes: 1 addition & 16 deletions .github/workflows/check-dist-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,4 @@ jobs:
path: dist/
tagging:
needs: check-dist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: '10'

# Details and Docu
# https://github.com/anothrNick/github-tag-action
# https://github.com/geoadmin/doc-guidelines/blob/master/GIT_FLOW.md#versioning
- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.36.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
RELEASE_BRANCHES: master
TAG_CONTEXT: repo
uses: geoadmin/.github/.github/workflows/semver-release.yml@master
32 changes: 18 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- [Example usage](#example-usage)
- [Contributing](#contributing)
- [Setup your environment](#setup-your-environment)
- [Publish to a distribution branch](#publish-to-a-distribution-branch)
- [Create new Release](#create-new-release)
- [Validate](#validate)

## Description
Expand Down Expand Up @@ -52,10 +52,11 @@ title attached to the PR or based on the `milestone_pattern` input (default to `

## Outputs

| Variable | Type | Description |
| -------------- | ------ | -------------------- |
| `new_tag` | String | New tag created. |
| `previous_tag` | String | Previous tag if any. |
| Variable | Type | Description |
| -------------- | ------- | --------------------------------------------------- |
| `new_tag` | String | New tag created. |
| `previous_tag` | String | Previous tag if any. |
| `tag_created` | Boolean | `true` if a tag has been created, `false` otherwise |

## Example usage

Expand All @@ -67,7 +68,6 @@ on:
branches:
- master


jobs:
release:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -125,18 +125,22 @@ $ npm test
...
```

### Publish to a distribution branch
### Create new Release

Actions are run from GitHub repos so we will checkin the packed dist folder.

Then run [ncc](https://github.com/zeit/ncc) and push the results:
1. First make sure the version in `package.json` match the next release version, if not update it.
2. Then build the project, package it and push the changes as follow:

```bash
npm run package
git add dist
git commit -a -m "prod dependencies"
git push origin feature-your-feature
```
```bash
npm run all
git add dist
git commit -a -m "prod dependencies"
git push origin feature-your-feature
```

3. Create a PR to merge this in `develop` branch
4. Once the PR above has been merged, create a new Release PR to merge `develop` into `master`

### Validate

Expand Down
2 changes: 2 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ outputs:
description: 'New tag'
previous_tag:
description: 'Previous tag'
tag_created:
description: '"true" if a tag has been created, "false" otherwise'
runs:
using: 'node12'
main: 'dist/index.js'
16 changes: 9 additions & 7 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit fe9f37f

Please sign in to comment.