Skip to content

Commit 684c51d

Browse files
committed
auto produce release
1 parent 46cc051 commit 684c51d

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

.github/workflows/makefile.yml renamed to .github/workflows/check.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
name: Makefile CI and Release
1+
name: Check build
22

33
on:
4-
push:
5-
branches: [ "master" ]
64
pull_request:
75
branches: [ "master" ]
86

.github/workflows/release.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Bump version
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Bump version and push tag
12+
id: tag_version
13+
uses: mathieudutour/github-tag-action@v6.0
14+
with:
15+
github_token: ${{ secrets.GITHUB_TOKEN }}
16+
- name: Build
17+
run: make
18+
- name: Create a GitHub release
19+
uses: ncipollo/release-action@v1
20+
with:
21+
tag: ${{ steps.tag_version.outputs.new_tag }}
22+
name: Release ${{ steps.tag_version.outputs.new_tag }}
23+
body: ${{ steps.tag_version.outputs.changelog }}
24+
artifacts: "aaronrobson-cv.pdf"
25+
token: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,7 @@ make
3636
4. Allow it to download the `res.cls` package.
3737

3838
### To push to the [aaronrobson.uk/cv](http://www.aaronrobson.uk/cv/) website
39-
Run this to find what the next tag should be:
40-
```sh
41-
git tag
42-
```
43-
44-
Then tag and upload like this:
45-
```sh
46-
git tag vx.x
47-
git push --tags
48-
```
49-
50-
Raise the PR in github, but don't merge it yet (https://stackoverflow.com/questions/60597400/how-to-do-a-fast-forward-merge-on-github).
51-
52-
Then merge locally with:
53-
```sh
54-
git checkout master && git merge your-new-branch --ff-only
55-
```
56-
57-
And upload like this:
58-
```sh
59-
git checkout master
60-
git push
61-
```
39+
Make a change in a branch and push to github.
40+
Have the PR merged to master.
41+
A sutiable semantic version should be produced and the release produced here
42+
https://github.com/AaronRobson/AaronRobsonCV/releases/latest/

0 commit comments

Comments
 (0)