Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER

kelvich · kelvich · commit 080484de2d91 · 2017-09-19T16:23:13.000+03:00
diff --git a/.ci/make_test_base b/.ci/make_test_base
@@ -19,7 +19,7 @@ def prepare_extlist(value):
     if "pg_pathman" in l:
         # remove duplicates and reorder extension list to move pg_pathman to tail
         nl = sorted(list(set(l)), cmp = lambda a,b: 1 if a=="pg_pathman" else -1)
-        new_value = "'{}'".format(",".join(nl))
+        new_value = "'{0}'".format(",".join(nl))
         return new_value
     else:
         return value
diff --git a/.ci/run b/.ci/run
@@ -17,7 +17,8 @@ if [ "`id -un`" = "root" ]; then
 	else
 	    groupadd ci
 	    useradd -g ci ci
-	    chown -R ci:ci .
+	    # chown -R ci:ci .
+	    find . -type d -exec chown ci:ci {} +
 	fi
 	su ci -c ./.ci/build_and_test_world
     else
diff --git a/.ci/run.cmd b/.ci/run.cmd
@@ -1,10 +1,14 @@
 @echo off
 PATH=C:\Windows\system32;C:\Perl64\bin;C:\Program Files\Git\cmd;C:\msys64\usr\bin
 
+REM Copy source-repo to CI temporary catalog
+cp -r postgrespro/* .
+
 IF "%ARCH%"==""	     SET ARCH=X86
 IF "%ARCH%"=="x86"   SET ARCH=X86
 IF "%ARCH%"=="x64"   SET ARCH=X64
 IF "%ARCH%"=="amd64" SET ARCH=X64
+IF "%ARCH%"=="AMD64" SET ARCH=X64
 IF "%SDK%"=="" 	     SET SDK=SDK71
 
 echo BUILD_ID=%BUILD_ID%
