Skip to content
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

chore: add ./script/rebase-stage0.sh #3984

Merged
merged 6 commits into from
May 2, 2024
Merged

Conversation

nomeata
Copy link
Contributor

@nomeata nomeata commented Apr 24, 2024

heavily based on an script by Kim.

heavily based on an script by Kim.
@nomeata
Copy link
Contributor Author

nomeata commented Apr 24, 2024

It worked here in one simple test, more testing will happen in the wild, I fear :)

@github-actions github-actions bot temporarily deployed to lean-lang.org/lean4/doc April 24, 2024 10:28 Inactive
script/aux/rebase-editor.sh Outdated Show resolved Hide resolved
@github-actions github-actions bot added the toolchain-available A toolchain is available for this PR, at leanprover/lean4-pr-releases:pr-release-NNNN label Apr 24, 2024
@leanprover-community-mathlib4-bot
Copy link
Collaborator

leanprover-community-mathlib4-bot commented Apr 24, 2024

Mathlib CI status (docs):

  • ❗ Std/Mathlib CI will not be attempted unless your PR branches off the nightly-with-mathlib branch. Try git rebase fb135b8cfe83c8d9286a9d0198114b7cb306a67a --onto 62cdb51ed5b9d8487877d5a4adbcd4659d81fc6a. (2024-04-24 10:32:25)
  • ❗ Std CI can not be attempted yet, as the nightly-testing-2024-04-25 tag does not exist there yet. We will retry when you push more commits. If you rebase your branch onto nightly-with-mathlib, Std CI should run now. (2024-04-25 10:00:31)

REPO_ROOT=$(git rev-parse --show-toplevel)
# Run git rebase in interactive mode, but automatically edit the todo list
# using the defined GIT_SEQUENCE_EDITOR command
GIT_SEQUENCE_EDITOR="$REPO_ROOT/script/aux/rebase-editor.sh" git rebase -i "$BRANCH_TO_REBASE"
Copy link
Member

Choose a reason for hiding this comment

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

Could just forward all args ($@?) to allow for further flags or rebase target

@Kha
Copy link
Member

Kha commented Apr 24, 2024

Let's also move update-stage0 into aux/

@nomeata nomeata enabled auto-merge April 25, 2024 09:42
@github-actions github-actions bot temporarily deployed to lean-lang.org/lean4/doc April 25, 2024 10:03 Inactive
@nomeata nomeata added this pull request to the merge queue Apr 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 25, 2024
@nomeata nomeata added this pull request to the merge queue Apr 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 25, 2024
@nomeata
Copy link
Contributor Author

nomeata commented Apr 25, 2024

Hehe, guess I cannot call a directory aux on Windows. Will rename to lib.

@github-actions github-actions bot temporarily deployed to lean-lang.org/lean4/doc April 25, 2024 15:26 Inactive
@nomeata nomeata added this pull request to the merge queue Apr 26, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 26, 2024
@nomeata nomeata added this pull request to the merge queue Apr 26, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 26, 2024
@nomeata nomeata added this pull request to the merge queue May 2, 2024
Merged via the queue into master with commit 74adb09 May 2, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
toolchain-available A toolchain is available for this PR, at leanprover/lean4-pr-releases:pr-release-NNNN
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants