From patchwork Thu Jan 28 13:27:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 8150381 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 150FCBEEE5 for ; Thu, 28 Jan 2016 13:29:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18B032034C for ; Thu, 28 Jan 2016 13:29:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 282E12035B for ; Thu, 28 Jan 2016 13:28:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 555D26E892; Thu, 28 Jan 2016 05:28:57 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B92E06E898 for ; Thu, 28 Jan 2016 05:28:53 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 28 Jan 2016 05:28:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,358,1449561600"; d="scan'208";a="903003951" Received: from jnikula-mobl.fi.intel.com (HELO localhost) ([10.237.72.67]) by fmsmga002.fm.intel.com with ESMTP; 28 Jan 2016 05:28:52 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Jan 2016 15:27:21 +0200 Message-Id: <81579a92bd14e082476a5d1ebbf2ceb71cf76cee.1453985388.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [maintainer-tools PATCH v2 27/33] dim: abstract dim_update_next X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jani Nikula --- dim | 126 +++++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 64 insertions(+), 62 deletions(-) diff --git a/dim b/dim index 1ecdfefc4f11..25597743e2a0 100755 --- a/dim +++ b/dim @@ -708,6 +708,70 @@ function dim_for_each_workdirs done } +function dim_update_next +{ + assert_branch drm-intel-next-queued + + git pull --ff-only + + if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-fixes &> /dev/null ; then + echo "drm-intel-fixes not merged into -nigthly, please update!" + exit 2 + fi + if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-next-queued &> /dev/null ; then + echo "drm-intel-next-queued not merged into -nigthly, please update!" + exit 2 + fi + + driver_date=`date +%Y%m%d` + $DRY sed -i -e "s/^#define DRIVER_DATE.*\"[0-9]*\"$/#define DRIVER_DATE\t\t\"$driver_date\"/" \ + drivers/gpu/drm/i915/i915_drv.h + $DRY git add drivers/gpu/drm/i915/i915_drv.h + echo -e "drm/i915: Update DRIVER_DATE to $driver_date\n\nSigned-off-by: Daniel Vetter " | \ + git commit -s -F - + + gitk drm-intel-next-queued ^$DIM_DRM_UPSTREAM_REMOTE/drm-next & + + # try to push dinq first in case someone raced + dim push-queued + + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next + tag=drm-intel-next-$today + $DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next + git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag + + echo "Updating -testing to latest -nightly" + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$DIM_DRM_INTEL_REMOTE/drm-intel-nightly:drm-intel-testing + $DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing + $DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today + + cat > ~/tmp/test-request <<-HERE + Hi all, + + New -testing cycle with cool stuff: + HERE + obj=`git rev-parse $tag` + if [[ `git cat-file -t $obj` == "tag" ]] ; then + git cat-file -p $obj | tail -n+6 >> ~/tmp/test-request + else + echo "" >> ~/tmp/test-request + fi + cat >> ~/tmp/test-request <<-HERE + + Happy testing! + + Cheers, Daniel + HERE + + $DRY $DIM_MUA -s "Updated drm-intel-testing" \ + -i ~/tmp/test-request \ + -c "$addr_intel_gfx" \ + -c "$addr_intel_gfx_maintainer1" \ + -c "$addr_intel_gfx_maintainer2" \ + "$addr_intel_qa1" \ + "$addr_intel_qa2" +} + # dim_pull_request branch upstream function dim_pull_request { @@ -949,68 +1013,6 @@ fi # XXX: abscract each case to a dim_ prefixed function, and turn the help|*) case # into an else branch in the above check for functions. case "$subcmd" in - update-next) - assert_branch drm-intel-next-queued - - git pull --ff-only - - if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-fixes &> /dev/null ; then - echo "drm-intel-fixes not merged into -nigthly, please update!" - exit 2 - fi - if ! git branch --merged $DIM_DRM_INTEL_REMOTE/drm-intel-nightly | grep drm-intel-next-queued &> /dev/null ; then - echo "drm-intel-next-queued not merged into -nigthly, please update!" - exit 2 - fi - - driver_date=`date +%Y%m%d` - $DRY sed -i -e "s/^#define DRIVER_DATE.*\"[0-9]*\"$/#define DRIVER_DATE\t\t\"$driver_date\"/" \ - drivers/gpu/drm/i915/i915_drv.h - $DRY git add drivers/gpu/drm/i915/i915_drv.h - echo -e "drm/i915: Update DRIVER_DATE to $driver_date\n\nSigned-off-by: Daniel Vetter " | \ - git commit -s -F - - - gitk drm-intel-next-queued ^$DIM_DRM_UPSTREAM_REMOTE/drm-next & - - # try to push dinq first in case someone raced - dim push-queued - - git push $DRY_RUN $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next - tag=drm-intel-next-$today - $DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next - git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag - - echo "Updating -testing to latest -nightly" - git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$DIM_DRM_INTEL_REMOTE/drm-intel-nightly:drm-intel-testing - $DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing - $DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today - - cat > ~/tmp/test-request <<-HERE - Hi all, - - New -testing cycle with cool stuff: - HERE - obj=`git rev-parse $tag` - if [[ `git cat-file -t $obj` == "tag" ]] ; then - git cat-file -p $obj | tail -n+6 >> ~/tmp/test-request - else - echo "" >> ~/tmp/test-request - fi - cat >> ~/tmp/test-request <<-HERE - - Happy testing! - - Cheers, Daniel - HERE - - $DRY $DIM_MUA -s "Updated drm-intel-testing" \ - -i ~/tmp/test-request \ - -c "$addr_intel_gfx" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_intel_qa1" \ - "$addr_intel_qa2" - ;; tag-next) cd $DIM_PREFIX/$DIM_DRM_INTEL git fetch $DIM_DRM_INTEL_REMOTE