Skip to content

Commit

Permalink
pre-release commit all changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Sylvain Viart committed Apr 5, 2020
1 parent 62734fc commit 791ff6e
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 13 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ after_script:
# not called if before_install: fails.
# this should be run failure too
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash -x ./travis/reverse_ssh_tunnel.sh ; fi

3 changes: 2 additions & 1 deletion PROGRESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
## releasing v0.6.3-rc2

- finish release in docs/release.md
- tests/get_doctops.bats DRY previous VERSION
- OK: tests/get_doctops.bats DRY previous VERSION
- OK: fix: not ok 21 docopt_get_help_string on macos

## grammar programming

Expand Down
12 changes: 7 additions & 5 deletions deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ releases:
based on master branch
changes:
- fixed #44 get_docopts.sh for MACOS + tesing
- removed bats git submodule
- use [bats-core](https://github.com/bats-core/bats-core) as testing framework from travis
features changes:
- `docopts.sh` function `docopt_get_help_string()` now uses awk to extract only first `Usage:`
internal changes:
- more pre-built binaries, removed darwin/386
- fixed `docopts.sh` docopt_get_help_string could return more than one `Usage:`
- fixed #44 `get_docopts.sh` for MACOS + functionnal tests
- removed bats git submodule
- use [bats-core 1.2-dev](https://github.com/bats-core/bats-core) as testing framework from travis
- `deploy.sh` removed, now use its [own repository](https://github.com/opensource-expert/deploy.sh)
- updaed Makefile to use `get_ldflags.sh` from `deploy.sh`
- [travis hack](travis/get_bash5_macos.sh) to get faster build on macos with our embedded bash5 binary
Expand Down
2 changes: 1 addition & 1 deletion docopts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ docopt_get_help_string() {
# display result and format output
END {
for(i in usage) {
for(i=0; i<l; i++) {
# remove comment
sub("^# {0,1}", "", usage[i])
print usage[i]
Expand Down
23 changes: 18 additions & 5 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Increment the ./VERSION number

edit ./deployment.yml

- add the new tagget release by copying ./VERSION
- add the new tag name release matching ./VERSION
- the description you want, changes etc.

## 2. rebuild all
Expand Down Expand Up @@ -57,20 +57,33 @@ git tag -a $(cat ./VERSION) -m "docopts $(cat ./VERSION)"
git push docopts master
```

## 8. build the release
## 8. remove travis hack macos if any

```
sed -i -e '/travis.reverse_ssh_tunnel.sh/ s/^\([^#]\)/#\1/' .travis.yml
```

## 9. push the tag on docopts

```
git push docopts $(cat ./VERSION)
```

## 10. build the release

With [deploy.sh](https://github.com/opensource-expert/deploy.sh) installed in our PATH


```
deploy.sh build
```

## 9. deploy the release
## 11. deploy the release

load github env

```
export GITHUB_USER=docopt
export GITHUB_REPO=docopts
deploy.sh deploy
```


0 comments on commit 791ff6e

Please sign in to comment.