Commit bd87cdb6 authored by Jonathan Fiscus's avatar Jonathan Fiscus
Browse files

Merge branch 'development' into 'development'

Release 1.2.3

See merge request !42
parents 3cb7aef5 1913c75e
Pipeline #159172 passed with stage
in 39 seconds
1.2.3 - 01.31.20
================
* Update get-system git subcommand with a `--sha` optional parameter, along with tests and doc.
* Add a basic `Makefile` (use `make check` to run tests).
* Add script `merge_dev_into_master.sh`. It pulls the lastest changes, merges `development` on `master`, creates a tag and pushes.
1.2.2 - 08.14.19
================
* Add a script example to demonstrate data download, execution of the CLI, and validation of the outputs.
......
#!/bin/sh
###################################################################
# #
# Merge `development` branch into `master` branch and push with a #
# generic but explicit tag. #
# #
# The tag is update depending on the previous one: #
# - 1 -> 2 #
# - 1.0 -> 1.1 #
# - 1.0.1 -> 1.0.2 #
# #
# The description of the tag has the following format: #
# Release <tag> - MM.DD.YY #
# #
###################################################################
tag=`git describe --tags --abbrev=0`
subversion=$((`echo $tag | sed "s/.*\.//"` + 1))
tag=`echo $tag | sed "s/\.[^.]*$/\.$subversion/"`
date=`date +"%m.%d.%y"`
git pull origin master
git checkout master
git merge development
git tag -a $tag -m "Release $tag - $date"
git push --tags origin
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment