From 766177c4e8d5efd1a6ca60855e908d07b07cccd0 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 20 Aug 2023 02:34:25 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/create-branch.yml | 10 +++++----- template_config.yml | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 8f9ce5e5d..0459ba4a6 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-240-gd3a60ef +2021.08.26-241-g9cfc63e diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index 95c28a947..2bc5cde0a 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -36,7 +36,7 @@ jobs: - name: Install python dependencies run: | echo ::group::PYDEPS - pip install bump2version + pip install bump2version jinja2 pyyaml echo ::endgroup:: - name: Setting secrets @@ -47,16 +47,16 @@ jobs: - name: Verify that branch name matches current version string on main branch run: | X_Y_VERSION=$(grep version setup.py | sed -rn 's/version="(.*)\.0((a[0-9]+)|(b[0-9]+))?\.dev",/\1/p' | awk '{$1=$1};1') - if [[ "$X_Y_VERSION" != "${{ github.event.inputs.name }}" ]] + if [[ "$X_Y_VERSION" != "${{ inputs.name }}" ]] then echo "Branch name doesn't match the current version string $X_Y_VERSION." exit 1 fi - - name: Create ${{ github.event.inputs.name }} release branch + - name: Create ${{ inputs.name }} release branch run: | - git checkout -b ${{ github.event.inputs.name }} - git push origin ${{ github.event.inputs.name }} + git checkout -b ${{ inputs.name }} + git push origin ${{ inputs.name }} - name: Bump version on main branch run: | diff --git a/template_config.yml b/template_config.yml index 254641d57..529de0b06 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@2021.08.26-240-gd3a60ef +# generated with plugin_template@2021.08.26-241-g9cfc63e additional_repos: [] api_root: /pulp/ @@ -18,6 +18,7 @@ ci_update_branches: - '2.14' - '2.15' ci_update_docs: false +ci_update_release_behavior: null cli_package: pulp-cli cli_repo: https://github.com/pulp/pulp-cli.git core_import_allowed: []