Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 462c610

Browse files
cocoatomococoatomo
committed
Merge remote-tracking branch 'origin/2.7' into intl-2.7
2 parents 07c599e + 5dc275a commit 462c610

File tree

186 files changed

+6744
-1393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+6744
-1393
lines changed

‎.github/appveyor.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.7.13+.{build}
1+
version: 2.7build{build}
22
clone_depth: 5
33
branches:
44
only:
@@ -7,27 +7,29 @@ branches:
77
- buildbot-custom
88
cache:
99
- externals -> PCbuild\*
10+
before_build:
11+
- ps: |+
12+
if ($env:APPVEYOR_RE_BUILD) {
13+
echo 'Doing full build due to re-build request.'
14+
} elseif (!$env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) {
15+
echo 'Not a PR, doing full build.'
16+
} else {
17+
git fetch -q origin +refs/heads/$env:APPVEYOR_REPO_BRANCH
18+
$mergebase = git merge-base HEAD FETCH_HEAD
19+
$changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)'
20+
If (!$changes) {
21+
echo 'Only docs were updated, stopping build process.'
22+
Exit-AppveyorBuild
23+
}
24+
echo 'Doing full build due to non-doc changes in these files:'
25+
echo $changes
26+
}
27+
28+
1029
build_script:
11-
- cmd: PCbuild\build.bat -e
12-
- cmd: PCbuild\python.exe -m test.pythoninfo
30+
- cmd: PCbuild\build.bat -e
31+
- cmd: PCbuild\python.exe -m test.pythoninfo
1332
test_script:
14-
- cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest -j2
33+
- cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest -j2
1534
environment:
1635
HOST_PYTHON: C:\Python36\python.exe
17-
18-
# Only trigger AppVeyor if actual code or its configuration changes
19-
only_commits:
20-
files:
21-
- .github/appveyor.yml
22-
- .gitattributes
23-
- Grammar/
24-
- Include/
25-
- Lib/
26-
- Modules/
27-
- Objects/
28-
- PC/
29-
- PCBuild/
30-
- Parser/
31-
- Programs/
32-
- Python/
33-
- Tools/

‎.hgeol

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎.hgignore

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎.hgtags

Lines changed: 0 additions & 178 deletions
This file was deleted.

0 commit comments

Comments
 (0)