-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Add nightly rebase of branches with upstream julia #42
Conversation
with: | ||
affected_service: Engineering - Julia Upgrades - Medium Priority Only | ||
summary: "Nightly rebase failed for RelationalAI/julia branch `${{ matrix.julia_branch.name }}`" | ||
description: "Failed to rebase RelationalAI/julia branch `${{ matrix.julia_branch.name }}` branch on top of `${{ matrix.julia_branch.upstream}}`.\nPlease manually rebase ${{ matrix.julia_branch.name }}\n" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we have persistent open PRs for v1.x+RAI
-> v1.x
, so that we can easily see the diff and so also easily see the merge conflicts / any rebase mishaps in the GitHub UI? I think that'd be helpful. If we do, then i think it'd also be helpful to link the PR here too
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Like, open a PR from backports-release-1.9+RAI
-> backports-release-1.9
? Or backports-release-1.9+RAI
-> v1.9.3
? For the former, I think the PR would open upstream, which we wouldn't want. For the latter, it would show us the diff of commits that have been proposed in the next patch release + the patches we're carrying; is that what you're thinking? If so, I think that could be useful, yes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, right
Like, open a PR from backports-release-1.9+RAI -> backports-release-1.9
i was thinking this, but i meant a PR on this repo (not upstream), but that's because i was forgetting we aren't also keeping backports-release-1.9
up-to-date with upstream backports-release-1.9
. i.e. the PR diff would just show our patches to v1.9
why aren't we keeping backports-release-1.9
up to date? couldn't we just git pull
each day (it's not like we need to run tests)?
Or backports-release-1.9+RAI -> v1.9.3? ...it would show us the diff of commits that have been proposed in the next patch release + the patches we're carrying
that does sound kinda useful too, now you mention it 😆 But i'm more worried about seeing our changes than i am what's already in the upcoming Julia release from upstream
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I opened PRs between backports-release-1.9+RAI
and v1.9.3+RAI
for now so we can see the total diff of: 1) incoming changes that are proposed for next patch release and 2) our own patches we're carrying for the branch. They're now linked in the GHA failure mode and should make it easy to compare diffs.
Co-authored-by: Nick Robinson <[email protected]>
Co-authored-by: Nick Robinson <[email protected]>
Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
This reverts commit a3e016c.
Revert "Add nightly rebase of branches with upstream julia (#42)"
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
* Add nightly rebase of branches with upstream julia * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Update .github/workflows/nightly-rebase-upstream.yml Co-authored-by: Nick Robinson <[email protected]> * Updates --------- Co-authored-by: Nick Robinson <[email protected]>
This reverts commit a3e016c.
Without this change, the compiler fails to notice that `env_threads isa Int` in the fall-through case, leading to a union-split with a branch that is in fact unreachable: ``` 43 ┄ %109 = φ (#41 => %105, #42 => %108)::Union{Nothing, Int64} │ %110 = (%109 isa Int64)::Bool └─── goto #45 if not %110 ... 45 ─ %126 = π (%109, Nothing) │ Base.convert(Int64, %126)::Union{} └─── unreachable ``` After this change, the union-split is eliminated. Co-authored-by: Jeff Bezanson <[email protected]>
I'm opening this PR against the
master+RAI
branch, which I think we should switch as the "default" branch of this repo.