Skip to content

Allow using updated CircleCi without rebasing PRs #7770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
Jan 25, 2018
Merged

Allow using updated CircleCi without rebasing PRs #7770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .circleci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ BUILD="debug"
DMD=dmd
PIC=1

case $CIRCLE_STAGE in
case "${CIRCLE_STAGE}" in
# Defined by old, existing PRs
# Added to avoid needing to rebase them
build)
;&
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From https://circleci.com/gh/dlang/dmd/9422:

Using build environment variables:
  BASH_ENV=/tmp/.bash_env-5a68c715c9e77c00017dcb69-0-build
  CI=true
  CIRCLECI=true
  CIRCLE_BRANCH=pull/7769
  CIRCLE_BUILD_NUM=9422
  CIRCLE_BUILD_URL=https://circleci.com/gh/dlang/dmd/9422
  CIRCLE_COMPARE_URL=
  CIRCLE_JOB=build
  CIRCLE_NODE_INDEX=0
  CIRCLE_NODE_TOTAL=2
  CIRCLE_PREVIOUS_BUILD_NUM=9415
  CIRCLE_PROJECT_REPONAME=dmd
  CIRCLE_PROJECT_USERNAME=dlang
  CIRCLE_PR_NUMBER=7769
  CIRCLE_PR_REPONAME=dmd
  CIRCLE_PR_USERNAME=ntrel
  CIRCLE_PULL_REQUEST=https://github.com/dlang/dmd/pull/7769
  CIRCLE_PULL_REQUESTS=https://github.com/dlang/dmd/pull/7769
  CIRCLE_REPOSITORY_URL=git@github.com:dlang/dmd.git
  CIRCLE_SHA1=554828455a3e5651d0e1c1379a7f0daa6b93e615
  CIRCLE_SHELL_ENV=/tmp/.bash_env-5a68c715c9e77c00017dcb69-0-build
  CIRCLE_STAGE=build

;& is the bash fall-through for switch cases. It's already used at the end of this script.

Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jan 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI this is due to CircleCi being the only CI who doesn't merge a PR with its target branch. We have to do that manually and hence the YAML doesn't get updated as its read initially before the bash scripts are run.
So the "old" PRs are based on this config: https://github.com/dlang/dmd/blob/c4d0269dd434068230a4f83eb9d8137fa0147133/.circleci/config.yml which defines build

pic)
MODEL=64
PIC=1
Expand Down