Commit 707aa65c authored by Stefan Funk's avatar Stefan Funk 🐧
Browse files

Merge branch 'release/3.6.10'

parents d612c441 d7f1c69d
Bugfix Version 3.6.9 (September 14th 2021)
==========================================
Bugfix Version 3.6.10 (September 16th 2021)
===========================================
* Fix #81 (Datasheet nicht angezeigt)
* Change bugtracking URLs in documentation to Gitlab
* Add link to licenses to documentation
Release Version 3.6.9 (September 14th 2021)
===========================================
* Update documentation
* Fix #38: Add new version of Handsontable
......
......@@ -18,7 +18,7 @@ node {
// TODO: Set version number in the HTML pages, too! Decide between releases and snapshots!
// SNAPSHOTs are put into the SNAPSHOTS repo, releases and BETAs are put into the RELEASES repo!
package_version = '3.6.9'
package_version = '3.6.10'
name = 'dariahde-geobrowser'
description = 'DARIAH-DE Geo-Browser'
url = 'https://geobrowser.de.dariah.eu/'
......@@ -34,8 +34,8 @@ node {
git clone https://github.com/DARIAH-DE/PLATIN.git
# FIXME: Remove develop checkout if releasing!!!
cd PLATIN && git checkout develop && rake all
# cd PLATIN && rake all
# cd PLATIN && git checkout develop && rake all
cd PLATIN && rake all
echo "===> Preparing doc building"
umask 0022
......
......@@ -8,32 +8,41 @@ The deployment workflows for SNAPSHOT and RELEASE deployments are covered by the
## Specials in Geo-Browser and Datasheet releases are the following
You must first release the [DARIAH-DE PLATIN Library](https://github.com/DARIAH-DE/PLATIN) (only if changed at all!)
### Release PLATIN first (if changed)
You must first release the [DARIAH-DE PLATIN Library](https://github.com/DARIAH-DE/PLATIN) (only if changed at all!)
git checkout develop
git flow release start 3.6.9
edit the file `./PLATIN/js/GeoTemConfig.js` and maybe adapt all references and links from BETA versions and DEVELOPMENT services to RELEASE and PRODUCTIVE (such as DARIAH-DE OwnStorage)
Edit the file `./PLATIN/js/GeoTemConfig.js` and maybe adapt all references and links from BETA versions and DEVELOPMENT services to RELEASE and PRODUCTIVE (such as DARIAH-DE OwnStorage):
* dariahOwnStorageURL
* dariahOwnStorageURL
* dataSheetEditor
git commit -am "New RELEASE version 3.6.9"
git flow release finish 3.6.9
git flow release finish 3.6.9
edit `./PLATIN/js/GeoTemConfig.js` again and change back the
Edit `./PLATIN/js/GeoTemConfig.js` again and change back the
* dariahOwnStorageURL
* dariahOwnStorageURL
* dataSheetEditor
afterwards:
Afterwards:
git commit -am "New SNAPSHOT version 3.6.10-BETA"
git push origin develop master --tag
### Do in Gitflow Release Branch
### Release Geo-Browser
git checkout develop
git pull
git flow release start 3.6.9
* Please adapt the [Jenkinsfile](./Jenkinsfile) for the release version, please see comments there.
- Use `package_version = '3.6.4-BETA` for BETA deployment at [geobrowser.de.dariah.eu/beta](https://geobrowser.de.dariah.eu/beta), and
- use `package_version = '3.6.4'` for RELEASE deployment at [geobrowser.de.dariah.eu](https://geobrowser.de.dariah.eu).
- Use `package_version = '3.6.9-BETA` for BETA deployment at [geobrowser.de.dariah.eu/beta](https://geobrowser.de.dariah.eu/beta), and
- use `package_version = '3.6.9'` for RELEASE deployment at [geobrowser.de.dariah.eu](https://geobrowser.de.dariah.eu).
- See FIXME: Remove develop checkout if releasing!!!
* Adapt the version strings in the following files:
- [index.html](./index.html)
- [edit/index.html](./edit/index.html)
......@@ -44,7 +53,11 @@ afterwards:
- [js/dariah.geobro.conf.js](./js/dariah.geobro.conf.js)
* Update the [CHANGELOG.md](./CHANGELOG.md) to the new RELEASE version
### Do in next Gitflow develop Branch
git commit -am "String changes for new RELEASE version 3.6.9"
git flow release finish 3.6.9
* Increase version in Jenkinsfile (such as `3.6.5-BETA`) and change back Jenkinsfile release adaptations.
* Increase version in Jenkinsfile (such as `3.6.10-BETA`) and change back Jenkinsfile release adaptations.
* Increase version and add “-BETA“ in all above mentioned files.
git commit -am "New SNAPSHOT version 3.6.10-BETA"
git push origin develop mater --tags
......@@ -59,12 +59,12 @@ copyright = u'2021, DARIAH-DE'
# NOTE: Please use "2021-SNAPSHOT" for snapshot deployment, and
# "2021" (without suffix) for release deployment!
#version = '2021-BETA'
version = '2021'
version = '2021-09-16'
# The full version, including alpha/beta/rc tags.
# Please put here the release date as release version!
release = '2021-09-14'
#release = '2021-06-09-BETA'
release = '2021-09-16'
#release = '2021-09-16-BETA'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -285,4 +285,4 @@ GIT Repository
Bug Tracking
------------
* https://projects.gwdg.de/projects/geo-browser/work_packages
* https://gitlab.gwdg.de/dariah-de/geo-browser/-/issues
......@@ -256,4 +256,4 @@ PLATIN fork used in the DARIAH-DE Geo-Browser (mainly adapted configuration)
Bug Tracking
------------
* https://projects.gwdg.de/projects/geo-browser/work_packages
* https://gitlab.gwdg.de/dariah-de/geo-browser/-/issues
......@@ -29,6 +29,13 @@ Geo-Browser and Datasheet Editor
Datasheet Editor FAQ [de] <./de/datasheet-faq>
.. toctree::
:caption: Licenses
Geo-Browser and Datasheet Editor <https://gitlab.gwdg.de/dariah-de/geo-browser/-/blob/master/COPYING.LESSER>
PLATIN <https://github.com/DARIAH-DE/PLATIN/blob/master/COPYING.LESSER>
.. toctree::
:caption: Imprint and Privacy Policy
......
......@@ -253,7 +253,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.9 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/index.html">&nbsp;</a></span>
<span>Datasheet Editor version 3.6.10 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/index.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -118,7 +118,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.9 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/list.html">&nbsp;</a></span>
<span>Datasheet Editor version 3.6.10 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/list.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -77,5 +77,5 @@
});
</script>
</body>
<!-- Geo-Browser version 3.6.9 -->
<!-- Geo-Browser version 3.6.10 -->
</html>
......@@ -143,7 +143,7 @@
</div>
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Geo-Browser version 3.6.9 using <a href="https://github.com/DARIAH-DE/PLATIN">PLATIN</a> &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/index.html">&nbsp;</a></span>
<span>Geo-Browser version 3.6.10 using <a href="https://github.com/DARIAH-DE/PLATIN">PLATIN</a> &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/index.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
Markdown is supported
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