From 3c1db92d9e45371b5fd948dc02059cf545a9fdfc Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 14 Nov 2024 23:09:39 -0500 Subject: [PATCH] Weekly promotion of staging to mainline Perform an ff-only merge of `amd-staging` into an `amd-mainline` staging branch and open a pull request. --- .github/workflows/opensuse.yml | 2 ++ .github/workflows/redhat.yml | 2 ++ .github/workflows/ubuntu-focal.yml | 2 ++ .github/workflows/ubuntu-jammy.yml | 2 ++ .github/workflows/weekly-mainline-sync.yml | 26 ++++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 .github/workflows/weekly-mainline-sync.yml diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index f6de06e6de..89ae9ba727 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -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/** ] @@ -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: diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index d48ab5798e..aee533bf03 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -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/** ] @@ -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: diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 93ed618223..67c72611ec 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -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/** ] @@ -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: diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index b69b06345c..0bdc77ff6f 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -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/** ] @@ -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: diff --git a/.github/workflows/weekly-mainline-sync.yml b/.github/workflows/weekly-mainline-sync.yml new file mode 100644 index 0000000000..37b4609af9 --- /dev/null +++ b/.github/workflows/weekly-mainline-sync.yml @@ -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"