Date: Wed, 12 Aug 2020 16:25:26 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364170 - projects/release-git/release Message-ID: <202008121625.07CGPQNt090316@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Aug 12 16:25:25 2020 New Revision: 364170 URL: https://svnweb.freebsd.org/changeset/base/364170 Log: release: update to use git instead of svn: Makefile.* (cloudware): - Consistify setting the BUILDDATE for snapshots. release.conf.sample/release.sh: - Run 'git clone' in 'quiet' mode. Makefile.inc1: - Set BUILDDATE and export the variable. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: projects/release-git/release/Makefile.azure projects/release-git/release/Makefile.ec2 projects/release-git/release/Makefile.gce projects/release-git/release/Makefile.inc1 projects/release-git/release/release.conf.sample projects/release-git/release/release.sh Modified: projects/release-git/release/Makefile.azure ============================================================================== --- projects/release-git/release/Makefile.azure Wed Aug 12 16:16:17 2020 (r364169) +++ projects/release-git/release/Makefile.azure Wed Aug 12 16:25:25 2020 (r364170) @@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +-%Y-%m-%d +SNAPSHOT_DATE!= date +-${BUILDDATE} .endif AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd Modified: projects/release-git/release/Makefile.ec2 ============================================================================== --- projects/release-git/release/Makefile.ec2 Wed Aug 12 16:16:17 2020 (r364169) +++ projects/release-git/release/Makefile.ec2 Wed Aug 12 16:25:25 2020 (r364170) @@ -6,7 +6,7 @@ # .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" -AMINAMESUFFIX!= date +-%Y-%m-%d +AMINAMESUFFIX!= date +-${BUILDDATE} .endif .if defined(EC2PUBLIC) && !empty(EC2PUBLIC) PUBLISH= --public Modified: projects/release-git/release/Makefile.gce ============================================================================== --- projects/release-git/release/Makefile.gce Wed Aug 12 16:16:17 2020 (r364169) +++ projects/release-git/release/Makefile.gce Wed Aug 12 16:25:25 2020 (r364170) @@ -24,8 +24,7 @@ GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -_SNAPSHOT_DATE!= date +%Y%m%d -SNAPSHOT_DATE= -v${_SNAPSHOT_DATE} +SNAPSHOT_DATE= -v${BUILDDATE} GCE_FAMILY_SUFX= -snap .endif Modified: projects/release-git/release/Makefile.inc1 ============================================================================== --- projects/release-git/release/Makefile.inc1 Wed Aug 12 16:16:17 2020 (r364169) +++ projects/release-git/release/Makefile.inc1 Wed Aug 12 16:25:25 2020 (r364170) @@ -23,3 +23,9 @@ GITBRANCH!= ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/ GITREV!= ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true .export GITREV .endif + +# Set the build date, primarily for snapshot builds. +.if !defined(BUILDDATE) || empty(BUILDDATE) +BUILDDATE!= date +%Y%m%d +.export BUILDDATE +.endif Modified: projects/release-git/release/release.conf.sample ============================================================================== --- projects/release-git/release/release.conf.sample Wed Aug 12 16:16:17 2020 (r364169) +++ projects/release-git/release/release.conf.sample Wed Aug 12 16:25:25 2020 (r364170) @@ -24,7 +24,7 @@ DOCBRANCH="main" PORTBRANCH="main" ## Sample configuration for using git from ports. -#GITCMD="/usr/local/bin/git clone --branch main" +#GITCMD="/usr/local/bin/git clone -q --branch main" ## Set to override the default target architecture. #TARGET="amd64" Modified: projects/release-git/release/release.sh ============================================================================== --- projects/release-git/release/release.sh Wed Aug 12 16:16:17 2020 (r364169) +++ projects/release-git/release/release.sh Wed Aug 12 16:25:25 2020 (r364170) @@ -68,7 +68,7 @@ env_setup() { echo "*** The devel/git port/package is required." exit 1 fi - VCSCMD="/usr/local/bin/git clone" + VCSCMD="/usr/local/bin/git clone -q" # The default git checkout server, and branches for src/, doc/, # and ports/.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008121625.07CGPQNt090316>