Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit080484d

Browse files
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER
2 parents6aa1c9f +21d3520 commit080484d

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

‎.ci/make_test_base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def prepare_extlist(value):
1919
if"pg_pathman"inl:
2020
# remove duplicates and reorder extension list to move pg_pathman to tail
2121
nl=sorted(list(set(l)),cmp=lambdaa,b:1ifa=="pg_pathman"else-1)
22-
new_value="'{}'".format(",".join(nl))
22+
new_value="'{0}'".format(",".join(nl))
2323
returnnew_value
2424
else:
2525
returnvalue

‎.ci/run

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ if [ "`id -un`" = "root" ]; then
1717
else
1818
groupadd ci
1919
useradd -g ci ci
20-
chown -R ci:ci.
20+
# chown -R ci:ci .
21+
find. -type d -exec chown ci:ci {} +
2122
fi
2223
su ci -c ./.ci/build_and_test_world
2324
else

‎.ci/run.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
@echooff
22
PATH=C:\Windows\system32;C:\Perl64\bin;C:\Program Files\Git\cmd;C:\msys64\usr\bin
33

4+
REM Copy source-repo to CI temporary catalog
5+
cp -r postgrespro/* .
6+
47
IF"%ARCH%"==""SETARCH=X86
58
IF"%ARCH%"=="x86"SETARCH=X86
69
IF"%ARCH%"=="x64"SETARCH=X64
710
IF"%ARCH%"=="amd64"SETARCH=X64
11+
IF"%ARCH%"=="AMD64"SETARCH=X64
812
IF"%SDK%"==""SETSDK=SDK71
913

1014
echo BUILD_ID=%BUILD_ID%

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp