diff --git a/.versionrc.json b/.versionrc.json new file mode 100644 index 000000000..25c298f45 --- /dev/null +++ b/.versionrc.json @@ -0,0 +1,7 @@ +{ + "bumpFiles": [ + "package.json", + "backend/package.json", + "webapp/package.json" + ] +} diff --git a/VERSION b/VERSION deleted file mode 100644 index 0c62199f1..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.2.1 diff --git a/backend/package.json b/backend/package.json index 779a51185..e80df24f8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "human-connection-backend", - "version": "0.0.1", + "version": "0.2.1", "description": "GraphQL Backend for Human Connection", "main": "src/index.js", "scripts": { diff --git a/package.json b/package.json index 14fd25508..0e8930251 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,10 @@ "description": "Fullstack and API tests with cypress and cucumber for Human Connection", "author": "Human Connection gGmbh", "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/Human-Connection/Human-Connection.git" + }, "cypress-cucumber-preprocessor": { "nonGlobalStepDefinitions": true }, @@ -18,7 +22,7 @@ "cypress:open": "cross-env cypress open --browser chromium", "cucumber:setup": "cd backend && yarn run dev", "cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit", - "version": "auto-changelog -p" + "release": "standard-version" }, "devDependencies": { "@babel/core": "^7.8.3", @@ -41,7 +45,8 @@ "neo4j-driver": "^4.0.1", "neode": "^0.3.7", "npm-run-all": "^4.1.5", - "slug": "^2.1.0" + "slug": "^2.1.0", + "standard-version": "^7.1.0" }, "resolutions": { "set-value": "^2.0.1" diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index b342278b9..3c746af92 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -2,7 +2,8 @@ ROOT_DIR=$(dirname "$0")/.. # 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) tags=($major $major.$minor $major.$minor.$patch) diff --git a/scripts/github_release.sh b/scripts/github_release.sh index 81e63d8ff..93f50289d 100755 --- a/scripts/github_release.sh +++ b/scripts/github_release.sh @@ -2,7 +2,7 @@ ROOT_DIR=$(dirname "$0")/.. RELEASE_DIR="${ROOT_DIR}/release" -VERSION=$(<$ROOT_DIR/VERSION) +VERSION=$(jq -r ".version" $ROOT_DIR/package.json) # 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" # done -ghr -soft "${VERSION}" +ghr -c "${VERSION}" "${VERSION}" diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index e01aae817..fc497bdf5 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -18,12 +18,23 @@ {{ $t('site.faq') }} - - - {{ $t('site.changelog') }} + + {{ version }} + +