Commit dacc4df6 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Updated version and readme for next release.

parent c3ecd085
Pipeline #68530 passed with stages
in 17 minutes and 53 seconds
......@@ -29,6 +29,10 @@ contributing, and API reference.
Omitted versions are plain bugfix releases with only minor changes and fixes.
### v0.7.5
- optimized API logs
- minor bugfixes
### v0.7.3
- fixed aborted raw-file downloads
- improved representation of data availability (staging, embargo, public) in GUI
......
#!/bin/sh
echo log, ref, version, commit = \"$(git log -1 --oneline)\", \"$(git describe --all)\", \"$(git describe --tags)\", \"$(git rev-parse --verify HEAD)\" > nomad/gitinfo.py
\ No newline at end of file
echo log, ref, version, commit = \"$(git log -1 --oneline)\", \"$(git describe --all)\", \"$(git describe --tags)\", \"$(git rev-parse --verify --short HEAD)\" > nomad/gitinfo.py
\ No newline at end of file
const fs = require('fs')
const packageJson = require('./package.json')
const appVersion = packageJson.version
const appCommit = packageJson.commit
const jsonData = {
version: appVersion
commit: appCommit
}
var jsonContent = JSON.stringify(jsonData)
......
{
"name": "nomad-fair-gui",
"version": "nomad-gui-version-placeholder",
"version": "0.7.5",
"commit": "nomad-gui-commit-placeholder",
"private": true,
"dependencies": {
"@material-ui/core": "^3.9.3",
......
......@@ -85,8 +85,8 @@ class About extends React.Component {
` : ''}
### About this version
- version (API): \`${info ? info.version : 'loading'}/${info ? info.release : 'loading'}\`
- version (GUI): \`${packageJson.version}\`
- version (API): \`${info ? info.version : 'loading'}/${info ? info.git.commit : 'loading'}\`
- version (GUI): \`${packageJson.version}/${packageJson.commit}\`
- domain: ${info ? info.domain.name : 'loading'}
- git: \`${info ? info.git.ref : 'loading'}; ${info ? info.git.version : 'loading'}\`
- last commit message: *${info ? info.git.log : 'loading'}*
......
......@@ -187,7 +187,7 @@ class NavigationUnstyled extends React.Component {
}
}).then((response) => response.json())
.then((meta) => {
if (meta.version !== packageJson.version) {
if (meta.commit !== packageJson.commit) {
console.log('GUI API version mismatch')
this.setState({showReloadSnack: true})
}
......
#!/bin/sh
version=`git describe --tags`
sed -i -e "s/nomad-gui-version-placeholder/$version/g" package.json
commit=`git rev-parse --short --verify HEAD`
sed -i -e "s/nomad-gui-commit-placeholder/$commit/g" package.json
rm -f package.json-e
......@@ -92,6 +92,7 @@ class InfoResource(Resource):
'git': {
'ref': gitinfo.ref,
'version': gitinfo.version,
'commit': gitinfo.commit,
'log': gitinfo.log
}
}, 200
......@@ -208,7 +208,7 @@ datacite = NomadConfig(
password='*'
)
version = '0.7.3'
version = '0.7.5'
commit = gitinfo.commit
release = 'devel'
domain = 'DFT'
......
apiVersion: v1
appVersion: "0.7.3"
appVersion: "0.7.5"
description: A Helm chart for Kubernetes that only runs nomad services and uses externally hosted databases.
name: nomad
version: 0.7.3
version: 0.7.5
......@@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs if 'sphinxcontrib.httpdomain' not in
setup(
name='nomad',
version='0.7.3',
version='0.7.5',
description='The nomad@FAIRDI infrastructure python package',
py_modules=['nomad'],
install_requires=reqs,
......
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