Skip to content

Commit

Permalink
Merge pull request #621 from pulp/update-ci/main
Browse files Browse the repository at this point in the history
Update CI files for branch main
  • Loading branch information
mdellweg authored Sep 18, 2023
2 parents f55f45a + 45c4f2c commit ead5f26
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-243-g0b216b2
2021.08.26-246-g98b439a
7 changes: 7 additions & 0 deletions .github/workflows/create-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 1
path: pulp_python

- uses: actions/setup-python@v3
with:
Expand All @@ -40,11 +41,13 @@ jobs:
echo ::endgroup::
- name: Setting secrets
working-directory: pulp_python
run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
env:
SECRETS_CONTEXT: ${{ toJson(secrets) }}

- name: Verify that branch name matches current version string on main branch
working-directory: pulp_python
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" != "${{ inputs.name }}" ]]
Expand All @@ -54,22 +57,26 @@ jobs:
fi
- name: Create ${{ inputs.name }} release branch
working-directory: pulp_python
run: |
git checkout -b ${{ inputs.name }}
git push origin ${{ inputs.name }}
- name: Bump version on main branch
working-directory: pulp_python
run: |
git checkout main
bump2version --no-commit minor
- name: Remove entries from CHANGES directory
working-directory: pulp_python
run: |
find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} +
- name: Make a PR with version bump and without CHANGES/*
uses: peter-evans/create-pull-request@v4
with:
path: pulp_python
token: ${{ secrets.RELEASE_TOKEN }}
committer: pulpbot <[email protected]>
author: pulpbot <[email protected]>
Expand Down

0 comments on commit ead5f26

Please sign in to comment.