diff --git a/release.sh b/release.sh index 978c5d61bd770f83f7dddf45f18d3f19a6be0a82..d36bf27516c35727dc934125b53e8c9843775519 100755 --- a/release.sh +++ b/release.sh @@ -19,50 +19,50 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then # Change the version in package.json and test file sed -i "s/version\": .*/version\": \"$2\",/g" package.json sed -i "s/Version: .*/Version: $2/g" ci/travis/debian/DEBIAN/control -# sed -i "s/version').equal('.*/version').equal('$2');/g" test/integration/branches.js -# sed -i "s/ release: .*/ release: v$2/g" appveyor.yml -# -# # GUI containers version -# sed -i "s/name\": .*/name\": \"v$2\",/g" gui/package.json -# sed -i "s/title\": .*/title\": \"v$2\",/g" gui/package.json -# sed -i "s/<title>Duniter.*<\/title>/<title>Duniter $2<\/title>/g" gui/index.html -# -# # Bump the before_deploy.sh -# sed -i "s/DUNITER_VER=.*/DUNITER_VER=$2/g" ci/travis/before_deploy.sh -# -# # Bump the install.sh -# sed -i "s/echo \"v.*\"/echo \"v$2\"/g" install.sh -# -# # (pre)-release management -# if [[ "$1" =~ ^rel$ ]]; then -# # This is RELEASE: change the version in public installer + add the RELEASE flag -# sed -i "s/echo \"v.*\"/echo \"v$2\"/g" install.sh -# sed -i "s/.*prerelease: true/# prerelease: true/g" .travis.yml -# sed -i "s/.*prerelease: true/# prerelease: true/g" appveyor.yml -# fi -# if [[ "$1" =~ ^pre$ ]]; then -# # This is PRE-RELEASE: just change the RELEASE flag to PRERELEASE -# sed -i "s/.*prerelease: true/ prerelease: true/g" .travis.yml -# sed -i "s/.*prerelease: true/ prerelease: true/g" appveyor.yml -# fi + sed -i "s/version').equal('.*/version').equal('$2');/g" test/integration/branches.js + sed -i "s/ release: .*/ release: v$2/g" appveyor.yml + + # GUI containers version + sed -i "s/name\": .*/name\": \"v$2\",/g" gui/package.json + sed -i "s/title\": .*/title\": \"v$2\",/g" gui/package.json + sed -i "s/<title>Duniter.*<\/title>/<title>Duniter $2<\/title>/g" gui/index.html + + # Bump the before_deploy.sh + sed -i "s/DUNITER_VER=.*/DUNITER_VER=$2/g" ci/travis/before_deploy.sh + + # Bump the install.sh + sed -i "s/echo \"v.*\"/echo \"v$2\"/g" install.sh + + # (pre)-release management + if [[ "$1" =~ ^rel$ ]]; then + # This is RELEASE: change the version in public installer + add the RELEASE flag + sed -i "s/echo \"v.*\"/echo \"v$2\"/g" install.sh + sed -i "s/.*prerelease: true/# prerelease: true/g" .travis.yml + sed -i "s/.*prerelease: true/# prerelease: true/g" appveyor.yml + fi + if [[ "$1" =~ ^pre$ ]]; then + # This is PRE-RELEASE: just change the RELEASE flag to PRERELEASE + sed -i "s/.*prerelease: true/ prerelease: true/g" .travis.yml + sed -i "s/.*prerelease: true/ prerelease: true/g" appveyor.yml + fi ;; *) echo "No task given" ;; esac -# # Commit -# git reset HEAD -# case "$1" in -# rel) -# git add install.sh package.json .travis.yml appveyor.yml test/integration/branches.js gui/package.json gui/index.html install.sh -# ;; -# pre) -# git add install.sh package.json .travis.yml appveyor.yml test/integration/branches.js gui/package.json gui/index.html -# ;; -# esac -# git commit -m "v$2" -# git tag "v$2" + # Commit + git reset HEAD + case "$1" in + rel) + git add install.sh package.json .travis.yml appveyor.yml test/integration/branches.js gui/package.json gui/index.html ci/travis/before_deploy.sh ci/travis/debian/DEBIAN/control install.sh + ;; + pre) + git add install.sh package.json .travis.yml appveyor.yml test/integration/branches.js gui/package.json gui/index.html ci/travis/before_deploy.sh ci/travis/debian/DEBIAN/control + ;; + esac + git commit -m "v$2" + git tag "v$2" else echo "Wrong version format" fi