From f43de27a4761f0b893766e153e6181ba20ac4c0b Mon Sep 17 00:00:00 2001 From: Tobias Grigo Date: Wed, 22 Jan 2025 14:27:45 +0100 Subject: [PATCH] Support 3.4 release branch --- .github/template_gitref | 2 +- .github/workflows/update_ci.yml | 31 +++++++++++++++++++++++++++++++ template_config.yml | 3 ++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 35466456..bdfe03f3 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -unknown +2021.08.26-420-gf332a34 diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 16c55659..81ff5306 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -136,6 +136,37 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true + - uses: "actions/checkout@v4" + with: + fetch-depth: 0 + path: "pulp_deb" + ref: "3.4" + + - name: "Run update" + working-directory: "pulp_deb" + run: | + ../plugin_template/scripts/update_ci.sh --release + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v6" + id: "create_pr_3_4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_deb" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.4" + branch: "update-ci/3.4" + base: "3.4" + delete-branch: true + - name: "Mark PR automerge" + working-directory: "pulp_deb" + run: | + gh pr merge --rebase --auto "${{ steps.create_pr_3_4.outputs.pull-request-number }}" + if: "steps.create_pr_3_4.outputs.pull-request-number" + env: + GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" + continue-on-error: true - uses: "actions/checkout@v4" with: fetch-depth: 0 diff --git a/template_config.yml b/template_config.yml index b5419cdc..d7a45cd7 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@unknown +# generated with plugin_template@2021.08.26-420-gf332a34 api_root: /pulp/ black: true @@ -62,6 +62,7 @@ stalebot_days_until_close: 30 stalebot_days_until_stale: 90 stalebot_limit_to_pulls: true supported_release_branches: +- '3.4' - '3.3' - '3.2' sync_ci: true