Skip to content

Fix branch checkout logic #2601

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
manasdk merged 2 commits into from
Mar 26, 2016
Merged

Fix branch checkout logic #2601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faa8682
Fix branch checkout logic
Mar 25, 2016
3fab929
CWD is always the build-dir
Mar 26, 2016
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
5 changes: 1 addition & 4 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ machine:

checkout:
post:
- |
git clone --depth 1 ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages
cd /home/ubuntu/st2/st2-packages
git checkout ${CIRCLE_BRANCH} || true
- git clone -b ${CIRCLE_BRANCH} --single-branch --depth 1 ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages
- .circle/buildenv.sh

dependencies:
Copy link
Member

@arm4b arm4b Mar 25, 2016

Choose a reason for hiding this comment

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

As noted before, see the discussion why this order || true hack was needed:
#2569

Copy link
Contributor Author

@manasdk manasdk Mar 25, 2016

Choose a reason for hiding this comment

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

Actually not having the remote branch is a failure. It should fail loud and clear rather than falling back to master.

So yeah some build might fail due to a race but its easy to get out of the race.

Copy link
Member

@arm4b arm4b Mar 25, 2016

Choose a reason for hiding this comment

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

For example when branch v1.4 in st2 is created and changes are pushed,
CI here will try to fetch v1.4 branch of st2-packages which is not yet created.

It means that first build for new major release will be always RED.

Also interesting coincidence that you was mentioned there: #2569 (comment) before to clarify existing release machinery :)

Copy link
Contributor Author

@manasdk manasdk Mar 25, 2016

Choose a reason for hiding this comment

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

RED is better than building against the wrong branch. I can live with that one.

Expand Down