-
Notifications
You must be signed in to change notification settings - Fork 17
.github: add workflow to open downstream PR #305
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
Draft
flouthoc
wants to merge
1
commit into
containers:main
Choose a base branch
from
flouthoc:downstream-PR
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
name: 'Open downstream PRs' | ||
|
||
on: | ||
pull_request: | ||
types: [opened, synchronize] # Triggers on PR creation and on new commits to the PR | ||
|
||
jobs: | ||
sync: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: 'Checkout Self' | ||
uses: actions/checkout@v4 | ||
# This checks out the code from the PR branch itself | ||
|
||
- name: 'Setup Go' | ||
uses: actions/setup-go@v4 | ||
with: | ||
go-version: '1.21' | ||
|
||
- name: 'Checkout forked buildah' | ||
uses: actions/checkout@v4 | ||
with: | ||
repository: 'podmanbot/buildah' # The target repository | ||
path: 'buildah' # Checkout into a sub-directory | ||
# token: ${{ secrets.VENDOR_TOKEN_PODMANBOT }} Use the PAT for write access | ||
|
||
- name: 'Vendor Code from this repo to buildah' | ||
run: | | ||
# Get the current commit SHA from the PR | ||
COMMIT_SHA="${{ github.event.pull_request.head.sha }}" | ||
echo "Using commit SHA: $COMMIT_SHA" | ||
|
||
cd buildah | ||
# Create a unique branch name based on the container-libs PR number | ||
BRANCH_NAME="sync/container-libs-${{ github.event.pull_request.number }}" | ||
git switch -c $BRANCH_NAME | ||
git remote add upstream https://github.com/containers/buildah.git | ||
git fetch upstream | ||
git rebase upstream/main | ||
|
||
|
||
echo "Current go.mod before update:" | ||
cat go.mod | ||
|
||
# Update the go.mod file to use the specific commit | ||
go mod edit -replace go.podman.io/common=github.com/containers/container-libs/common@${COMMIT_SHA} | ||
|
||
echo "After go mod edit" | ||
cat go.mod | ||
|
||
# Download and verify the module | ||
go mod tidy | ||
go mod vendor | ||
go mod verify | ||
|
||
echo "Updated go.mod:" | ||
cat go.mod | ||
|
||
- name: 'Commit and Push to buildah' | ||
run: | | ||
cd buildah | ||
git config user.name "github-actions[bot]" | ||
git config user.email "github-actions[bot]@users.noreply.github.com" | ||
|
||
BRANCH_NAME="sync/container-libs-${{ github.event.pull_request.number }}" | ||
git switch -c $BRANCH_NAME | ||
|
||
git add . | ||
git commit -m "feat: Vendor changes from podmanbot/container-libs#${{ github.event.pull_request.number }}" | ||
|
||
# Force push to update the branch if the action re-runs on 'synchronize' | ||
git push origin $BRANCH_NAME --force | ||
|
||
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV | ||
|
||
- name: 'Create or Update Pull Request in Buildah' | ||
id: create_pr | ||
env: | ||
GH_TOKEN: ${{ secrets.VENDOR_TOKEN_PODMANBOT }} | ||
SELF_REPO_PR_NUMBER: ${{ github.event.pull_request.number }} | ||
SELF_REPO_PR_URL: ${{ github.event.pull_request.html_url }} | ||
SELF_REPO_PR_TITLE: ${{ github.event.pull_request.title }} | ||
run: | | ||
cd buildah | ||
|
||
PR_TITLE="Sync: ${{ env.SELF_REPO_PR_TITLE }}" | ||
PR_BODY="This PR automatically vendors changes from [repo-A#${{ env.SELF_REPO_PR_NUMBER }}](${{ env.SELF_REPO_PR_URL }})." | ||
|
||
# Check if PR already exists for this branch | ||
EXISTING_PR_URL=$(gh pr list --head ${{ env.BRANCH_NAME }} --json url --jq '.[0].url' 2>/dev/null || echo "") | ||
|
||
if [ -n "$EXISTING_PR_URL" ]; then | ||
echo "Found existing PR: $EXISTING_PR_URL" | ||
# Update existing PR title and body | ||
gh pr edit $EXISTING_PR_URL \ | ||
--title "$PR_TITLE" \ | ||
--body "$PR_BODY" | ||
echo "Updated existing PR: $EXISTING_PR_URL" | ||
echo "pr_url=$EXISTING_PR_URL" >> $GITHUB_OUTPUT | ||
echo "pr_action=updated" >> $GITHUB_OUTPUT | ||
else | ||
# Create new PR | ||
NEW_PR_URL=$(gh pr create \ | ||
--repo containers/buildah \ | ||
--base main \ | ||
--head ${{ env.BRANCH_NAME }} \ | ||
--title "$PR_TITLE" \ | ||
--body "$PR_BODY") | ||
echo "Created new PR: $NEW_PR_URL" | ||
echo "pr_url=$NEW_PR_URL" >> $GITHUB_OUTPUT | ||
echo "pr_action=created" >> $GITHUB_OUTPUT | ||
fi | ||
|
||
- name: 'Comment on container-libs PR with the link to buildah PR' | ||
env: | ||
# GH_TOKEN: ${{ secrets.VENDOR_TOKEN_PODMANBOT }} | ||
SELF_REPO_PR_NUMBER: ${{ github.event.pull_request.number }} | ||
TARGET_REPO_PR_URL: ${{ steps.create_pr.outputs.pr_url }} | ||
PR_ACTION: ${{ steps.create_pr.outputs.pr_action }} | ||
run: | | ||
if [ "${{ env.PR_ACTION }}" = "created" ]; then | ||
COMMENT_BODY="✅ A new PR has been created in buildah to vendor these changes: **${{ env.TARGET_REPO_PR_URL }}**" | ||
else | ||
COMMENT_BODY="✅ The existing PR in buildah has been updated with these changes: **${{ env.TARGET_REPO_PR_URL }}**" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this going to add the same comment on every force-push? That might be rather annoying. Can this edit a pre-existing comment, or use some other way to convey that state? (a test status???) |
||
fi | ||
|
||
gh pr comment ${{ env.SELF_REPO_PR_NUMBER }} \ | ||
--repo ${{ github.repository }} \ | ||
--body "$COMMENT_BODY" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
There are 3 Go modules in this repo