This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit 66a38aec061798fe5957376d014721ca461dcc7f
Author: Mihai Moldovan <io...@ionic.de>
Date: Sat Mar 11 22:16:00 2023 +0100
bin/{build-{deb,osx,rpm},sbuild-deb}-package: remove BUILD_NUMBER from
version string.
This was meant to be reverted, but wasn't, so fix it up.
---
bin/build-deb-package | 4 ++--
bin/build-osx-package | 8 ++++----
bin/build-rpm-package | 4 ++--
bin/sbuild-deb-package | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bin/build-deb-package b/bin/build-deb-package
index f6a8e62..64635ef 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -312,9 +312,9 @@ build_packages() {
# modify changelog for this build
if [ "${COMPONENT}" != "${COMPONENT_NIGHTLY}"
]; then
- dch --distribution "${codename}"
--force-distribution -l
"+git${DATE}.${GITREV}.${BUILD_NUMBER}+${numerical_version}.${COMPONENT}."
"Auto-built ${pretty_dist} ${l_CODENAME} (${numerical_version}) package for
${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
+ dch --distribution "${codename}"
--force-distribution -l
"+git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Auto-built
${pretty_dist} ${l_CODENAME} (${numerical_version}) package for ${REPOS_SERVER}
repository (Git commit: ${GIT_OBJECT_ID})."
else
- dch --distribution "${codename}"
--force-distribution -l
"~git${DATE}.${GITREV}.${BUILD_NUMBER}+${numerical_version}.${COMPONENT}."
"Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME}
(${numerical_version}) package for ${REPOS_SERVER} repository (Git commit:
${GIT_OBJECT_ID})."
+ dch --distribution "${codename}"
--force-distribution -l
"~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}."
"Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME}
(${numerical_version}) package for ${REPOS_SERVER} repository (Git commit:
${GIT_OBJECT_ID})."
fi
mkdir -p --
"${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386}
OTHERMIRROR=""
diff --git a/bin/build-osx-package b/bin/build-osx-package
index 28069bd..001c66b 100755
--- a/bin/build-osx-package
+++ b/bin/build-osx-package
@@ -273,9 +273,9 @@ build_packages() {
typeset top_commit_id="$(git rev-parse --no-flags
"HEAD^{commit}")"
typeset base_name="${PROJECT}-${upstream_version}."
if [ "${is_release}" -eq "0" ]; then
-
base_name="${base_name}git${DATE}.${gitrev}.${BUILD_NUMBER}.${COMPONENT}."
+
base_name="${base_name}git${DATE}.${gitrev}.${COMPONENT}."
else
- base_name="${base_name}${DATE}.${BUILD_NUMBER}."
+ base_name="${base_name}${DATE}."
fi
base_name="${base_name}OSX_${os_major}_${os_minor}.dmg"
mv "client_build/${PROJECT}.dmg"
"${PKGDIST}/${l_CODENAME}/${base_name}"
@@ -318,10 +318,10 @@ upload_packages() {
# Delete files so that checksums are always regenerated.
if [ "${is_release}" -eq "0" ]; then
# Nightly builds are tracked by date and
gitrev, so that multiple packages are possible per day if the repository
changes between builds.
- 0</dev/null ssh -- "${REPOS_SERVER}" "rm -rf --
'${OSX_REPOS_BASE}/${PROJECT}/${COMPONENT}/${upstream_version}/'*${DATE}.${gitrev}.${BUILD_NUMBER}*OSX_${os_major}_${os_minor}*"
+ 0</dev/null ssh -- "${REPOS_SERVER}" "rm -rf --
'${OSX_REPOS_BASE}/${PROJECT}/${COMPONENT}/${upstream_version}/'*${DATE}.${gitrev}.*OSX_${os_major}_${os_minor}*"
else
# Releases are tracked by date, so that only
one specific build per day is available.
- 0</dev/null ssh -- "${REPOS_SERVER}" "rm -rf --
'${OSX_REPOS_BASE}/${PROJECT}/${COMPONENT}/${upstream_version}/'*${DATE}.${BUILD_NUMBER}*OSX_${os_major}_${os_minor}*"
+ 0</dev/null ssh -- "${REPOS_SERVER}" "rm -rf --
'${OSX_REPOS_BASE}/${PROJECT}/${COMPONENT}/${upstream_version}/'*${DATE}.*OSX_${os_major}_${os_minor}*"
fi
# Remove packages that are older than 30 days, if
building nightlies.
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 7a7ecbe..a28d56f 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -995,7 +995,7 @@ build_packages() {
else
IS_RELEASE="1"
fi
- sed -i "${PROJECT}.spec" -e
"s/%{?dist}/.${IS_RELEASE}.git${DATE}.${GITREV}.${BUILD_NUMBER}.${COMPONENT}%{?dist}/"
+ sed -i "${PROJECT}.spec" -e
"s/%{?dist}/.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}%{?dist}/"
# apply patches from debian/patches/* so that
they end up in the tarball
# ... esp. relevant for NX (redistributed)
@@ -1293,7 +1293,7 @@ build_packages() {
# For
information on why this weird -print0 | read -r -d '' construction works,
# refer to the
first instance of this in this script.
- find
"${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/" -type 'f' -iname
"${RPMSRCPKG}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${BUILD_NUMBER}.${COMPONENT}.*.src.rpm"
-print0 | while read -r -d '' srpm; do
+ find
"${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/" -type 'f' -iname
"${RPMSRCPKG}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}.*.src.rpm"
-print0 | while read -r -d '' srpm; do
if
/usr/bin/mock ${MOCK_CHROOT_CONFIG}
--resultdir="${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" "${srpm}"; then
# Clean up source RPM files. We build them separately.
find "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -type 'f' -iname
'*.src.rpm' -exec rm -f -- '{}' \;
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 44490bc..87ee6bf 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -414,9 +414,9 @@ build_packages() {
# modify changelog for this build
if [ "${COMPONENT}" != "${COMPONENT_NIGHTLY}"
]; then
- dch --distribution "${codename}"
--force-distribution -l
"+git${DATE}.${GITREV}.${BUILD_NUMBER}+${numerical_version}.${COMPONENT}."
"Auto-built ${pretty_dist} ${l_CODENAME} (${numerical_version}) package for
${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})."
+ dch --distribution "${codename}"
--force-distribution -l
"+git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Auto-built
${pretty_dist} ${l_CODENAME} (${numerical_version}) package for ${REPOS_SERVER}
repository (Git commit: ${GIT_OBJECT_ID})."
else
- dch --distribution "${codename}"
--force-distribution -l
"~git${DATE}.${GITREV}.${BUILD_NUMBER}+${numerical_version}.${COMPONENT}."
"Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME}
(${numerical_version}) package for ${REPOS_SERVER} repository (Git commit:
${GIT_OBJECT_ID})."
+ dch --distribution "${codename}"
--force-distribution -l
"~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}."
"Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME}
(${numerical_version}) package for ${REPOS_SERVER} repository (Git commit:
${GIT_OBJECT_ID})."
fi
typeset -i skip_arch_all="0"
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/buildscripts.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
