Skip to content

.github: opendownstream-pr add matrix for podman repo #360

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

.github: opendownstream-pr add matrix for podman repo #360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 23 additions & 14 deletions .github/workflows/opendownstream-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ on:
jobs:
sync:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- repo_name: buildah
fork_repo: podmanbot/buildah
upstream_repo: containers/buildah
- repo_name: podman
fork_repo: podmanbot/podman
upstream_repo: containers/podman
Comment on lines +18 to +23
Copy link
Member

@Luap99 Luap99 Oct 1, 2025

Choose a reason for hiding this comment

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

Is there a benfit to define all three values, you could have also just written
podmanbot/${{ matrix.repo_name }}' and containers/${{ matrix.repo_name }}' in the places instead. Though I guess it is mostly a style choice and this here should be fine

steps:
- name: 'Checkout Self'
uses: actions/checkout@v5
Expand All @@ -22,25 +31,25 @@ jobs:
with:
go-version: 'stable'

- name: 'Checkout forked buildah'
- name: 'Checkout forked ${{ matrix.repo_name }}'
uses: actions/checkout@v5
with:
repository: 'podmanbot/buildah' # The target repository
path: 'buildah' # Checkout into a sub-directory
repository: '${{ matrix.fork_repo }}' # The target repository
path: '${{ matrix.repo_name }}' # Checkout into a sub-directory
fetch-depth: '1'
token: ${{ secrets.VENDOR_TOKEN_PODMANBOT }} # We need to push into pobmanbot/buildah
Copy link
Contributor

@mtrmac mtrmac Oct 20, 2025

Choose a reason for hiding this comment

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

(This comment could be updated.)


- name: 'Vendor Code from this repo to buildah'
- name: 'Vendor Code from this repo to ${{ matrix.repo_name }}'
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
cd ${{ matrix.repo_name }}
# 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 remote add upstream https://github.com/${{ matrix.upstream_repo }}.git
git fetch upstream
git rebase upstream/main

Expand All @@ -62,9 +71,9 @@ jobs:
echo "Updated go.mod:"
cat go.mod

- name: 'Commit and Push to buildah'
- name: 'Commit and Push to ${{ matrix.repo_name }}'
run: |
cd buildah
cd ${{ matrix.repo_name }}
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

Expand Down Expand Up @@ -92,7 +101,7 @@ jobs:

echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV

- name: 'Create or Update Pull Request in Buildah'
- name: 'Create or Update Pull Request in ${{ matrix.repo_name }}'
id: create_pr
if: env.SKIP_PR != 'true'
env:
Expand All @@ -101,7 +110,7 @@ jobs:
SELF_REPO_PR_URL: ${{ github.event.pull_request.html_url }}
SELF_REPO_PR_TITLE: ${{ github.event.pull_request.title }}
run: |
cd buildah
cd ${{ matrix.repo_name }}

BRANCH_NAME="sync/container-libs-${{ github.event.pull_request.number }}"
PR_TITLE="Sync: ${SELF_REPO_PR_TITLE}"
Expand All @@ -110,7 +119,7 @@ jobs:
# Check if PR already exists for this branch
echo "Searching for existing PR with branch: $BRANCH_NAME"

EXISTING_PR_URL=$(gh pr list --repo containers/buildah --head "$BRANCH_NAME" --json url --jq '.[0].url // empty' 2>/dev/null || echo "")
EXISTING_PR_URL=$(gh pr list --repo ${{ matrix.upstream_repo }} --head "$BRANCH_NAME" --json url --jq '.[0].url // empty' 2>/dev/null || echo "")

if [ -n "$EXISTING_PR_URL" ]; then
echo "Found existing PR: $EXISTING_PR_URL"
Expand All @@ -125,7 +134,7 @@ jobs:
# Create new PR
echo "Creating new PR with head: podmanbot:$BRANCH_NAME"
NEW_PR_URL=$(gh pr create \
--repo containers/buildah \
--repo ${{ matrix.upstream_repo }} \
--draft \
--base main \
--head "podmanbot:$BRANCH_NAME" \
Expand All @@ -136,7 +145,7 @@ jobs:
echo "pr_action=created" >> $GITHUB_OUTPUT
fi

- name: 'Comment on container-libs PR with the link to buildah PR'
- name: 'Comment on container-libs PR with the link to ${{ matrix.repo_name }} PR'
if: env.SKIP_PR != 'true'
env:
GH_TOKEN: ${{ secrets.VENDOR_TOKEN_PODMANBOT }}
Expand All @@ -145,7 +154,7 @@ jobs:
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 }}**"
COMMENT_BODY="✅ A new PR has been created in ${{ matrix.repo_name }} to vendor these changes: **${{ env.TARGET_REPO_PR_URL }}**"
gh pr comment ${{ env.SELF_REPO_PR_NUMBER }} \
--repo ${{ github.repository }} \
--body "$COMMENT_BODY"
Expand Down