mirror of
https://github.com/dlang/dmd.git
synced 2025-05-14 08:56:32 +03:00
CirrusCi: merge pull requests with target branch (#12667)
Co-authored-by: Sebastian Wilzbach <seb@wilzba.ch>
This commit is contained in:
parent
39e19a8f9b
commit
a990f19038
1 changed files with 7 additions and 0 deletions
|
@ -4,6 +4,13 @@ common_steps_template: &COMMON_STEPS_TEMPLATE
|
||||||
setup_repos_script: |
|
setup_repos_script: |
|
||||||
set -uexo pipefail
|
set -uexo pipefail
|
||||||
ln -s $CIRRUS_WORKING_DIR ../dmd
|
ln -s $CIRRUS_WORKING_DIR ../dmd
|
||||||
|
|
||||||
|
# for PRs - merge with target branch first
|
||||||
|
if [ ! -z ${CIRRUS_PR+x} ] ; then
|
||||||
|
git fetch origin "+refs/pull/$CIRRUS_PR/merge:";
|
||||||
|
git checkout -f FETCH_HEAD;
|
||||||
|
fi
|
||||||
|
|
||||||
./ci.sh setup_repos "${CIRRUS_BASE_BRANCH:-$CIRRUS_BRANCH}"
|
./ci.sh setup_repos "${CIRRUS_BASE_BRANCH:-$CIRRUS_BRANCH}"
|
||||||
build_script: ./ci.sh build
|
build_script: ./ci.sh build
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue