Skip to content

Subtree Update Automation Workflow Bugs #249

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

Closed
carolynzech opened this issue Feb 20, 2025 · 0 comments · Fixed by #250
Closed

Subtree Update Automation Workflow Bugs #249

carolynzech opened this issue Feb 20, 2025 · 0 comments · Fixed by #250
Assignees
Labels
Maintenance Maintenance related issues for the challange

Comments

@carolynzech
Copy link

carolynzech commented Feb 20, 2025

#248 creates a pull request to update subtree/library. There are a few issues I discovered while using it:

  1. The last commit it introduces is erroneous; it should not be creating new submodules. (See how it creates a new library/ folder inside the existing library folder). In CI, the Kani workflow tries to initialize these submodules, but the .gitmodules file doesn't mention them, so CI crashes.

The fix for this issue should produce the exact same output as #248 minus this one erroneous commit.

  1. sed -i "s/^channel = \"nightly-.*\"/channel = \"${NEXT_TOOLCHAIN_DATE}\"/" rust-toolchain.toml
    git -c user.name=gitbot -c user.email=git@bot \
    commit -m "Update toolchain to ${NEXT_TOOLCHAIN_DATE}" rust-toolchain.toml

should instead be:

sed -i "s/^channel = \"nightly-.*\"/channel = \"nightly-${NEXT_TOOLCHAIN_DATE}\"/" rust-toolchain.toml
git -c user.name=gitbot -c user.email=git@bot \
  commit -m "Update toolchain to ${NEXT_TOOLCHAIN_DATE}" rust-toolchain.toml

so that rust-toolchain.toml reads nightly-{DATE} instead of just {DATE}

@carolynzech carolynzech added the Maintenance Maintenance related issues for the challange label Feb 20, 2025
@carolynzech carolynzech changed the title Subtree Update Automation Workflow; Submodules Bug Subtree Update Automation Workflow Bugs Feb 20, 2025
github-merge-queue bot pushed a commit that referenced this issue Mar 4, 2025
Improvements to the workflow to update the subtree:
- Check for existing PRs before creating new ones
- Update the Kani version automatically
- Remove erroneous additional submodules
- Typo in toolchain file

Resolves #249

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.

---------

Co-authored-by: Carolyn Zech <[email protected]>
Co-authored-by: Michael Tautschnig <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance Maintenance related issues for the challange
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants