Branch: refs/heads/add_ci_builders Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 20 Feb 2022 17:26:53 UTC Commit: 406d4e435c193d25a8a5042ce4db71131ddd46a1 https://github.com/geany/infrastructure/commit/406d4e435c193d25a8a5042ce4db7...
Log Message: ----------- Add timestamp to version string and installer names
Modified Paths: -------------- builders/scripts/build_mingw_geany.sh builders/scripts/build_mingw_geany_plugins.sh
Modified: builders/scripts/build_mingw_geany.sh 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -110,13 +110,14 @@ git_clone_geany_if_necessary() { parse_geany_version() { GEANY_VERSION=$(sed -n -E -e 's/^AC_INIT.[Geany], [(.+)],/\1/p' ${GEANY_BUILD_DIR}/configure.ac) GEANY_GIT_REVISION=$(cd ${GEANY_BUILD_DIR} && git rev-parse --short --revs-only HEAD 2>/dev/null || true) + TIMESTAMP=$(date +%Y%m%d%H%M%S) # add pull request number if this is a CI and a PR build if [ "${GITHUB_PULL_REQUEST}" ]; then - GEANY_VERSION="${GEANY_VERSION}pr${GITHUB_PULL_REQUEST}" + GEANY_VERSION="${GEANY_VERSION}_pr_${TIMESTAMP}_${GITHUB_PULL_REQUEST}" elif [ "${CI}" -a "${GEANY_GIT_REVISION}" ]; then - GEANY_VERSION="${GEANY_VERSION}ci${GEANY_GIT_REVISION}" + GEANY_VERSION="${GEANY_VERSION}_ci_${TIMESTAMP}_${GEANY_GIT_REVISION}" elif [ "${GEANY_GIT_REVISION}" ]; then - GEANY_VERSION="${GEANY_VERSION}git${GEANY_GIT_REVISION}" + GEANY_VERSION="${GEANY_VERSION}_git_${TIMESTAMP}_${GEANY_GIT_REVISION}" fi GEANY_INSTALLER_FILENAME="geany-${GEANY_VERSION}_setup.exe" }
Modified: builders/scripts/build_mingw_geany_plugins.sh 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -112,13 +112,14 @@ git_clone_geany_plugins_if_necessary() { parse_geany_plugins_version() { GEANY_PLUGINS_VERSION=$(sed -n -E -e 's/^AC_INIT.[geany-plugins], [(.+)]./\1/p' ${GEANY_PLUGINS_BUILD_DIR}/configure.ac) GEANY_PLUGINS_GIT_REVISION=$(cd ${GEANY_PLUGINS_BUILD_DIR} && git rev-parse --short --revs-only HEAD 2>/dev/null || true) + TIMESTAMP=$(date +%Y%m%d%H%M%S) # add pull request number if this is a CI and a PR build if [ "${GITHUB_PULL_REQUEST}" ]; then - GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}pr${GITHUB_PULL_REQUEST}" + GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}_pr_${TIMESTAMP}_${GITHUB_PULL_REQUEST}" elif [ "${CI}" -a "${GEANY_PLUGINS_GIT_REVISION}" ]; then - GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}ci${GEANY_PLUGINS_GIT_REVISION}" + GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}_ci_${TIMESTAMP}_${GEANY_PLUGINS_GIT_REVISION}" elif [ "${GEANY_PLUGINS_GIT_REVISION}" ]; then - GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}git${GEANY_PLUGINS_GIT_REVISION}" + GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}_git_${TIMESTAMP}_${GEANY_PLUGINS_GIT_REVISION}" fi GEANY_PLUGINS_INSTALLER_FILENAME="geany-plugins-${GEANY_PLUGINS_VERSION}_setup.exe" }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).