Skip to content

Subtree Update Automation Fixes #250

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
merged 11 commits into from
Mar 4, 2025
Merged

Subtree Update Automation Fixes #250

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ec9799
add nightly
thanhnguyen-aws Feb 20, 2025
0f8495a
rm library folder
thanhnguyen-aws Feb 21, 2025
59e3597
add check existing PR
thanhnguyen-aws Feb 21, 2025
dec57a2
add checking merge PR
thanhnguyen-aws Feb 21, 2025
0022e27
add comment for remove folder
thanhnguyen-aws Feb 21, 2025
129ec10
Modify check for existing pull requests
Mar 3, 2025
2c019d9
Update .github/workflows/update-subtree.yml
thanhnguyen-aws Mar 3, 2025
10db0ba
Update .github/workflows/update-subtree.yml
thanhnguyen-aws Mar 3, 2025
2bb07fc
Merge branch 'main' into fixaupdatebug
thanhnguyen-aws Mar 3, 2025
c521566
Add instruction to use rebase strategy for subtree merge
Mar 3, 2025
3617191
Update .github/workflows/update-subtree.yml
tautschnig Mar 3, 2025
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
19 changes: 18 additions & 1 deletion .github/workflows/update-subtree.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ jobs:
echo "CURRENT_COMMIT_HASH=${CURRENT_COMMIT_HASH}" >> $GITHUB_ENV
echo "NEXT_COMMIT_HASH=${NEXT_COMMIT_HASH}" >> $GITHUB_ENV

- name: Check for existing pull requests
run: |
cd verify-rust-std
if gh pr list --json title --jq '.[] | select(.title == "Update subtree/library to ${{ env.NEXT_TOOLCHAIN_DATE }}") | .title' | grep -q .; then
echo "SUBTREE_PR_EXISTS=yes" >> $GITHUB_ENV
else
echo "SUBTREE_PR_EXISTS=no" >> $GITHUB_ENV
fi
if gh pr list --json title --jq '.[] | select(.title == "Merge subtree update for toolchain nightly-${{ env.NEXT_TOOLCHAIN_DATE }}") | .title' | grep -q .; then
echo "MERGE_PR_EXISTS=yes" >> $GITHUB_ENV
else
echo "MERGE_PR_EXISTS=no" >> $GITHUB_ENV
fi
env:
GH_TOKEN: ${{ github.token }}

- name: Update subtree/library locally
run: |
cd rust-tmp
Expand All @@ -77,6 +93,7 @@ jobs:
git remote add rust-filtered ../rust-tmp/
git fetch rust-filtered
git checkout -b subtree/library rust-filtered/subtree/library
rm -rf library
SUBTREE_HEAD_MSG=$(git log --format=%s -n 1 origin/subtree/library)
UPSTREAM_FROM=$(git log --grep="${SUBTREE_HEAD_MSG}" -n 1 --format=%H rust-filtered/subtree/library)
UPSTREAM_HEAD=$(git log --format=%H -n 1 rust-filtered/subtree/library)
Expand Down Expand Up @@ -119,7 +136,7 @@ jobs:
echo "MERGE_CONFLICTS=no" >> $GITHUB_ENV
fi

sed -i "s/^channel = \"nightly-.*\"/channel = \"${NEXT_TOOLCHAIN_DATE}\"/" rust-toolchain.toml
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

Expand Down
Loading