Skip to content

Commit

Permalink
Weekly promotion of staging to mainline
Browse files Browse the repository at this point in the history
Perform an ff-only merge of `amd-staging` into an `amd-mainline` staging branch and open a pull request.
  • Loading branch information
dgaliffiAMD committed Nov 15, 2024
1 parent ba0efac commit 420c40e
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/opensuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'
pull_request:
branches: [ amd-mainline, amd-staging, release/** ]
Expand All @@ -25,6 +26,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'

concurrency:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'
pull_request:
branches: [ amd-mainline, amd-staging, release/** ]
Expand All @@ -25,6 +26,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'

concurrency:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ubuntu-focal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'
pull_request:
branches: [ amd-mainline, amd-staging, release/** ]
Expand All @@ -25,6 +26,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'

concurrency:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ubuntu-jammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'
pull_request:
branches: [ amd-mainline, amd-staging, release/** ]
Expand All @@ -25,6 +26,7 @@ on:
- '.github/workflows/cpack.yml'
- '.github/workflows/containers.yml'
- '.github/workflows/formatting.yml'
- '.github/workflows/weekly-mainline-sync.yml'
- 'docker/**'

concurrency:
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/weekly-mainline-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Sync Mainline with Staging
on:
workflow_dispatch:
schedule:
- cron: 0 5 * * sun

jobs:
promote-stg-to-main:
runs-on: ubuntu-latest
name: Promote Staging to Mainline
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: amd-mainline
fetch-depth: '0'

- name: Merge - Fast Forward Only
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git checkout amd-mainline
git checkout -b promote-staging-$(date +%F)
git merge --ff-only origin/amd-staging
git push -u origin HEAD
gh pr create --base amd-mainline --title "Promote \`amd-staging\` to \`amd-mainline\`" --fill --label "automerge"

0 comments on commit 420c40e

Please sign in to comment.