ESGF / esgf-build

Scripts for building ESGF releases, creating repo mirrors and pushing binaries.
https://esgf.github.io/esgf-build/
0 stars 2 forks source link

Master build should automatically merge devel into master branch #25

Closed William-Hill closed 5 years ago

William-Hill commented 7 years ago

Currently the build process doesn't automatically merge the devel branch into the master branch when building a master distribution.

The code at the relevant devel tag should be merged into master automatically when building master.

sashakames commented 7 years ago

for 2.x the tag is in esg-init - but this would change for 3.0 A corollary for this is that for devel builds, the tag used should be derived from esg-init or tag manifest file rather than a straight-up git describe.