mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 21:51:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use GitHub's merge head for checking out PRs

Browse source
This commit is contained in:
Sebastian Wilzbach 2018-01-01 15:43:00 +01:00
parent 82c2ebef38
commit 366fee847b
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -18,10 +18,10 @@ jobs:
name: Install GDB name: Install GDB
- run: - run:
command: ./.circleci/run.sh setup-repos command: ./.circleci/run.sh setup-repos
name: Clone DMD & DRuntime name: Clone DRuntime & Phobos
- run: - run:
command: ./.circleci/run.sh coverage command: ./.circleci/run.sh coverage
name: Run Phobos testsuite with -cov name: Run testsuite with -cov
- run: - run:
command: ./.circleci/run.sh check-clean-git command: ./.circleci/run.sh check-clean-git
name: Check for temporary files generated by the test suite name: Check for temporary files generated by the test suite

7
.circleci/run.sh
View file

@ -74,12 +74,9 @@ setup_repos() {
# merge testee PR with base branch (master) before testing # merge testee PR with base branch (master) before testing
if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then
local head=$(git rev-parse HEAD) local head=$(git rev-parse HEAD)
git fetch https://github.com/dlang/$CIRCLE_PROJECT_REPONAME.git $base_branch git remote add upstream "https://github.com/dlang/$CIRCLE_PROJECT_REPONAME.git"
git fetch -q upstream "+refs/pull/${CIRCLE_PR_NUMBER}/merge:"
git checkout -f FETCH_HEAD git checkout -f FETCH_HEAD
local base=$(git rev-parse HEAD)
git config user.name 'CI'
git config user.email '<>'
git merge -m "Merge $head into $base" $head
fi fi
for proj in druntime phobos; do for proj in druntime phobos; do