This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 12af527 bin/gitdate: detect macOS and call date in a different way. new b7e28d0 bin/{build-{deb,osx,rpm},sbuild-deb}-package: revert back to using the current date in our package versions. new 7b1afea bin/ubuntu-codename-to-version.sh: add newer versions jammy, kinetic and lunar. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-deb-package | 4 ++-- bin/build-osx-package | 8 ++++---- bin/build-rpm-package | 4 ++-- bin/sbuild-deb-package | 4 ++-- bin/ubuntu-codename-to-version.sh | 5 ++++- 5 files changed, 14 insertions(+), 11 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 7b1afeaa3d8896e5aea72793a5f2e271e3046dcf Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 16 21:42:38 2023 +0100 bin/ubuntu-codename-to-version.sh: add newer versions jammy, kinetic and lunar. --- bin/ubuntu-codename-to-version.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/ubuntu-codename-to-version.sh b/bin/ubuntu-codename-to-version.sh index 84375c8..f845c4b 100755 --- a/bin/ubuntu-codename-to-version.sh +++ b/bin/ubuntu-codename-to-version.sh @@ -45,8 +45,11 @@ case "${codename}" in # we can't really do better here. ("devel") echo "9999";; - ("impish") echo "21.10";; + ("lunar") echo "23.04";; + ("kinetic") echo "22.10";; + ("jammy") echo "22.04";; + ("impish") echo "21.10";; ("hirsute") echo "21.04";; ("groovy") echo "20.10";; ("focal") echo "20.04";; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit b7e28d0405162483c5225b32f81c65fa04ec24b2 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 16 21:19:45 2023 +0100 bin/{build-{deb,osx,rpm},sbuild-deb}-package: revert back to using the current date in our package versions. Using the git date did sound like a smart idea first, but actually creates a new problem: we wouldn't be able to revbump packages after the initial build (or just rebuild them again). While it would technically work for RPM and OSX packages, there is no way users would know that a package actually changed and for DEB packages, it would lead to rebuild packages not making it to the archive due to checksum mismatches. Just revert back to the old build date mechanism for now. I will eventually change the Jenkins build setup to new pipeline job structure that solves such issues by building a common source package. --- 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 7bc9be6..0584fa2 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${gitdate}.${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}.${BUILD_NUMBER}+${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${gitdate}.${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}.${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})." fi mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386} OTHERMIRROR="" diff --git a/bin/build-osx-package b/bin/build-osx-package index 75ee650..b13875c 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${gitdate}.${gitrev}.${BUILD_NUMBER}.${COMPONENT}." + base_name="${base_name}git${DATE}.${gitrev}.${BUILD_NUMBER}.${COMPONENT}." else - base_name="${base_name}${gitdate}.${BUILD_NUMBER}." + base_name="${base_name}${DATE}.${BUILD_NUMBER}." 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}/'*${gitdate}.${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}.${BUILD_NUMBER}*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}/'*${gitdate}.${BUILD_NUMBER}*OSX_${os_major}_${os_minor}*" + 0</dev/null ssh -- "${REPOS_SERVER}" "rm -rf -- '${OSX_REPOS_BASE}/${PROJECT}/${COMPONENT}/${upstream_version}/'*${DATE}.${BUILD_NUMBER}*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 b612357..81f4936 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -930,7 +930,7 @@ build_packages() { else IS_RELEASE="1" fi - sed -i "${PROJECT}.spec" -e "s/%{?dist}/.${IS_RELEASE}.git${gitdate}.${GITREV}.${BUILD_NUMBER}.${COMPONENT}%{?dist}/" + sed -i "${PROJECT}.spec" -e "s/%{?dist}/.${IS_RELEASE}.git${DATE}.${GITREV}.${BUILD_NUMBER}.${COMPONENT}%{?dist}/" # apply patches from debian/patches/* so that they end up in the tarball # ... esp. relevant for NX (redistributed) @@ -1213,7 +1213,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${gitdate}.${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}.${BUILD_NUMBER}.${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 5b2b59e..14de4df 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -413,9 +413,9 @@ build_packages() { # modify changelog for this build if [ "${COMPONENT}" != "${COMPONENT_NIGHTLY}" ]; then - dch --distribution "${codename}" --force-distribution -l "+git${gitdate}.${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}.${BUILD_NUMBER}+${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${gitdate}.${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}.${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})." 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
-
git-admin＠x2go.org