Uploaded image for project: 'ReactOS Online Service'
  1. ReactOS Online Service
  2. ONLINE-669

buildbot/scripts/patching: accept Git patches, in addition to Svn ones.

    XMLWordPrintable

    Details

    • Type: Improvement
    • Status: Resolved
    • Priority: Major
    • Resolution: Fixed
    • Fix Version/s: None
    • Component/s: Buildbot
    • Labels:
      None
    • Sprint:
      January 2017

      Description

      I locally use Git, not Svn.

      Moved from ROSTESTS-251:

      To test, I did a "svn co .../trunk/", then

      ...\svn_reactos\trunk> svn patch ..\..\ROSTESTS-251_kernel32_winetests.patch
      U         rostests\winetests\kernel32\CMakeLists.txt
      U         rostests\winetests\kernel32\generated.c
      U         rostests\winetests\kernel32\testlist.c

      So the patch is fine wrt Svn (1.8.14).

      Looking again at the GCCLin_x86 builder log

      ../../patching 39156
       in dir /srv/buildbot/Build_GCCLin_x86/build (timeout 1200 secs)
      * Downloading patch.
      Not a patch file!
      program finished with exit code 1

      looks like a download issue.


      Ah! "Stupid" script:
      buildbot/scripts/patching

      echo "* Downloading patch."
      wget -q --output-document=$SOURCEDIR/default.patch "http://jira.reactos.org/secure/attachment/$1/" || exit $?
       
      if ! grep -q "Index:" $SOURCEDIR/default.patch; then
      	echo "Not a patch file!"
      	exit 1
      fi

      NB:
      After manually editing the patch, it was accepted by Svn (1.8.8)

        Attachments

          Activity

            People

            • Assignee:
              Colin Finck Colin Finck
              Reporter:
              Serge Gautherie Serge Gautherie
            • Votes:
              1 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: