Skip to content
This repository has been archived by the owner on Oct 7, 2022. It is now read-only.

always build on deploy branch, rebased onto current branch #128

Merged
merged 1 commit into from
Sep 14, 2021
Merged

always build on deploy branch, rebased onto current branch #128

merged 1 commit into from
Sep 14, 2021

Conversation

rhelmer
Copy link
Contributor

@rhelmer rhelmer commented Sep 14, 2021

The approach here is:

  1. build job checks out deploy branch and rebases the currently-tested branch onto it, and preserves artifacts
  2. if (1) passes then the test job runs tests, and the resulting artifacts are thrown away
  3. if the currently-tested branch is main, and (2) passes, then restore the artifacts from (1). Circle checks in these artifacts to deploy branch.

Circle then deploys from the deploy branch as a separate job, which is how we're intending SRE to do it from their own CI (they will just watch our deploy branch).

@rhelmer rhelmer merged commit 4d8e960 into mozilla-rally:master Sep 14, 2021
@rhelmer rhelmer self-assigned this Sep 14, 2021
rhelmer added a commit that referenced this pull request Sep 14, 2021
@rhelmer
always build on deploy branch, rebased onto current branch (#128)
3802b50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@rhelmer rhelmer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@rhelmer