mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
feat(webapp): Display deployed version in footer
Remove VERSION file in favour of version entry in `package.json`. Parse this version in our build server scripts. This commit also introduces `standard-version` which we can use to generate our `CHANGELOG.md` with `yarn run release`. close #1831
This commit is contained in:
parent
f13eb29ad3
commit
4631db0a1b
7
.versionrc.json
Normal file
7
.versionrc.json
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"bumpFiles": [
|
||||||
|
"package.json",
|
||||||
|
"backend/package.json",
|
||||||
|
"webapp/package.json"
|
||||||
|
]
|
||||||
|
}
|
||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "human-connection-backend",
|
"name": "human-connection-backend",
|
||||||
"version": "0.0.1",
|
"version": "0.2.1",
|
||||||
"description": "GraphQL Backend for Human Connection",
|
"description": "GraphQL Backend for Human Connection",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@ -4,6 +4,10 @@
|
|||||||
"description": "Fullstack and API tests with cypress and cucumber for Human Connection",
|
"description": "Fullstack and API tests with cypress and cucumber for Human Connection",
|
||||||
"author": "Human Connection gGmbh",
|
"author": "Human Connection gGmbh",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Human-Connection/Human-Connection.git"
|
||||||
|
},
|
||||||
"cypress-cucumber-preprocessor": {
|
"cypress-cucumber-preprocessor": {
|
||||||
"nonGlobalStepDefinitions": true
|
"nonGlobalStepDefinitions": true
|
||||||
},
|
},
|
||||||
@ -18,7 +22,7 @@
|
|||||||
"cypress:open": "cross-env cypress open --browser chromium",
|
"cypress:open": "cross-env cypress open --browser chromium",
|
||||||
"cucumber:setup": "cd backend && yarn run dev",
|
"cucumber:setup": "cd backend && yarn run dev",
|
||||||
"cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit",
|
"cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit",
|
||||||
"version": "auto-changelog -p"
|
"release": "standard-version"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.8.3",
|
"@babel/core": "^7.8.3",
|
||||||
@ -41,7 +45,8 @@
|
|||||||
"neo4j-driver": "^4.0.1",
|
"neo4j-driver": "^4.0.1",
|
||||||
"neode": "^0.3.7",
|
"neode": "^0.3.7",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"slug": "^2.1.0"
|
"slug": "^2.1.0",
|
||||||
|
"standard-version": "^7.1.0"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"set-value": "^2.0.1"
|
"set-value": "^2.0.1"
|
||||||
|
|||||||
@ -2,7 +2,8 @@
|
|||||||
ROOT_DIR=$(dirname "$0")/..
|
ROOT_DIR=$(dirname "$0")/..
|
||||||
# BUILD_COMMIT=${TRAVIS_COMMIT:-$(git rev-parse HEAD)}
|
# BUILD_COMMIT=${TRAVIS_COMMIT:-$(git rev-parse HEAD)}
|
||||||
|
|
||||||
IFS='.' read -r major minor patch < $ROOT_DIR/VERSION
|
VERSION=$(jq -r '.version' $ROOT_DIR/package.json)
|
||||||
|
IFS='.' read -r major minor patch <<< $VERSION
|
||||||
apps=(nitro-web nitro-backend neo4j maintenance)
|
apps=(nitro-web nitro-backend neo4j maintenance)
|
||||||
tags=($major $major.$minor $major.$minor.$patch)
|
tags=($major $major.$minor $major.$minor.$patch)
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
ROOT_DIR=$(dirname "$0")/..
|
ROOT_DIR=$(dirname "$0")/..
|
||||||
RELEASE_DIR="${ROOT_DIR}/release"
|
RELEASE_DIR="${ROOT_DIR}/release"
|
||||||
|
|
||||||
VERSION=$(<$ROOT_DIR/VERSION)
|
VERSION=$(jq -r ".version" $ROOT_DIR/package.json)
|
||||||
|
|
||||||
# mkdir -p $RELEASE_DIR
|
# mkdir -p $RELEASE_DIR
|
||||||
|
|
||||||
@ -13,4 +13,4 @@ VERSION=$(<$ROOT_DIR/VERSION)
|
|||||||
# docker image save "humanconnection/${app}:latest" | gzip > "${RELEASE_DIR}/${app}.${VERSION}.tar.gz"
|
# docker image save "humanconnection/${app}:latest" | gzip > "${RELEASE_DIR}/${app}.${VERSION}.tar.gz"
|
||||||
# done
|
# done
|
||||||
|
|
||||||
ghr -soft "${VERSION}"
|
ghr -c "${VERSION}" "${VERSION}"
|
||||||
|
|||||||
@ -18,12 +18,20 @@
|
|||||||
{{ $t('site.faq') }}
|
{{ $t('site.faq') }}
|
||||||
</a>
|
</a>
|
||||||
<span>-</span>
|
<span>-</span>
|
||||||
<a href="https://github.com/Human-Connection/Human-Connection/releases" target="_blank">
|
<a href="https://github.com/Human-Connection/Human-Connection/blob/master/CHANGELOG.md" target="_blank">
|
||||||
{{ $t('site.changelog') }}
|
{{ version }}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return { version: `v${process.env.release}` }
|
||||||
|
},
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.ds-footer {
|
.ds-footer {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|||||||
@ -624,7 +624,6 @@
|
|||||||
"imprint": "Impressum",
|
"imprint": "Impressum",
|
||||||
"termsAndConditions": "Nutzungsbedingungen",
|
"termsAndConditions": "Nutzungsbedingungen",
|
||||||
"data-privacy": "Datenschutz",
|
"data-privacy": "Datenschutz",
|
||||||
"changelog": "Änderungen",
|
|
||||||
"contact": "Kontakt",
|
"contact": "Kontakt",
|
||||||
"tribunal": "Registergericht",
|
"tribunal": "Registergericht",
|
||||||
"register": "Registernummer",
|
"register": "Registernummer",
|
||||||
|
|||||||
@ -107,7 +107,6 @@
|
|||||||
"imprint": "Imprint",
|
"imprint": "Imprint",
|
||||||
"termsAndConditions": "Terms and conditions",
|
"termsAndConditions": "Terms and conditions",
|
||||||
"data-privacy": "Data privacy",
|
"data-privacy": "Data privacy",
|
||||||
"changelog": "Changes",
|
|
||||||
"contact": "Contact",
|
"contact": "Contact",
|
||||||
"tribunal": "Registry court",
|
"tribunal": "Registry court",
|
||||||
"register": "Registry number",
|
"register": "Registry number",
|
||||||
|
|||||||
@ -619,7 +619,6 @@
|
|||||||
"imprint": "Pie de imprenta",
|
"imprint": "Pie de imprenta",
|
||||||
"termsAndConditions": "Términos y condiciones",
|
"termsAndConditions": "Términos y condiciones",
|
||||||
"data-privacy": "Protección de datos",
|
"data-privacy": "Protección de datos",
|
||||||
"changelog": "Cambios e historia",
|
|
||||||
"contact": "Contacto",
|
"contact": "Contacto",
|
||||||
"tribunal": "Tribunal de registro",
|
"tribunal": "Tribunal de registro",
|
||||||
"register": "Número de registro",
|
"register": "Número de registro",
|
||||||
|
|||||||
@ -561,7 +561,6 @@
|
|||||||
"imprint": "Mentions légales",
|
"imprint": "Mentions légales",
|
||||||
"termsAndConditions": "Conditions générales",
|
"termsAndConditions": "Conditions générales",
|
||||||
"data-privacy": "Protection des données",
|
"data-privacy": "Protection des données",
|
||||||
"changelog": "Changements et historique",
|
|
||||||
"contact": "Contacter",
|
"contact": "Contacter",
|
||||||
"tribunal": "Tribunal de registre",
|
"tribunal": "Tribunal de registre",
|
||||||
"register": "Numéro de registre",
|
"register": "Numéro de registre",
|
||||||
|
|||||||
@ -561,7 +561,6 @@
|
|||||||
"imprint": "Impressum",
|
"imprint": "Impressum",
|
||||||
"termsAndConditions": "",
|
"termsAndConditions": "",
|
||||||
"data-privacy": "protezione dei dati",
|
"data-privacy": "protezione dei dati",
|
||||||
"changelog": "Cambiamenti e storia",
|
|
||||||
"contact": "Contatto",
|
"contact": "Contatto",
|
||||||
"tribunal": "registro tribunale",
|
"tribunal": "registro tribunale",
|
||||||
"register": "numero di registro",
|
"register": "numero di registro",
|
||||||
|
|||||||
@ -4,7 +4,6 @@
|
|||||||
"imprint": "Afdruk",
|
"imprint": "Afdruk",
|
||||||
"termsAc": "Gebruiksvoorwaarden",
|
"termsAc": "Gebruiksvoorwaarden",
|
||||||
"data-privacy": "gegevensbescherming",
|
"data-privacy": "gegevensbescherming",
|
||||||
"changelog": "Veranderingen & Geschiedenis",
|
|
||||||
"contact": "contact",
|
"contact": "contact",
|
||||||
"tribunal": "registerrechtbank",
|
"tribunal": "registerrechtbank",
|
||||||
"register": "inschrijfnummer",
|
"register": "inschrijfnummer",
|
||||||
|
|||||||
@ -34,7 +34,6 @@
|
|||||||
"imprint": "Nadruk",
|
"imprint": "Nadruk",
|
||||||
"termsAc": "Warunki użytkowania",
|
"termsAc": "Warunki użytkowania",
|
||||||
"data-privacy": "ochrona danych",
|
"data-privacy": "ochrona danych",
|
||||||
"changelog": "Zmiany i historia",
|
|
||||||
"contact": "Kontakt",
|
"contact": "Kontakt",
|
||||||
"tribunal": "sąd rejestrowy",
|
"tribunal": "sąd rejestrowy",
|
||||||
"register": "numer rejestracyjny",
|
"register": "numer rejestracyjny",
|
||||||
|
|||||||
@ -561,7 +561,6 @@
|
|||||||
"imprint": "Impressão",
|
"imprint": "Impressão",
|
||||||
"termsAndConditions": "Termos e Condições",
|
"termsAndConditions": "Termos e Condições",
|
||||||
"data-privacy": "Proteção de Dados",
|
"data-privacy": "Proteção de Dados",
|
||||||
"changelog": "Mudanças e Histórico",
|
|
||||||
"contact": "Contato",
|
"contact": "Contato",
|
||||||
"tribunal": "tribunal de registo",
|
"tribunal": "tribunal de registo",
|
||||||
"register": "número de registo",
|
"register": "número de registo",
|
||||||
|
|||||||
@ -734,7 +734,6 @@
|
|||||||
"site": {
|
"site": {
|
||||||
"back-to-login": "Вернуться на страницу входа",
|
"back-to-login": "Вернуться на страницу входа",
|
||||||
"bank": "банковский счет",
|
"bank": "банковский счет",
|
||||||
"changelog": "Изменения",
|
|
||||||
"code-of-conduct": "Кодекс поведения",
|
"code-of-conduct": "Кодекс поведения",
|
||||||
"contact": "Контакт",
|
"contact": "Контакт",
|
||||||
"data-privacy": "Конфиденциальность",
|
"data-privacy": "Конфиденциальность",
|
||||||
|
|||||||
@ -35,6 +35,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
env: {
|
env: {
|
||||||
|
release: pkg.version,
|
||||||
// pages which do NOT require a login
|
// pages which do NOT require a login
|
||||||
publicPages: [
|
publicPages: [
|
||||||
'login',
|
'login',
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hc-webapp-next",
|
"name": "human-connection-webapp",
|
||||||
"version": "1.0.0",
|
"version": "0.2.1",
|
||||||
"description": "Human Connection Frontend",
|
"description": "Human Connection Frontend",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Grzegorz Leoniec (appinteractive)",
|
"Grzegorz Leoniec (appinteractive)",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user