Skip to content

Commit

Permalink
Merge pull request #1030 from pulp/minor-version-bump
Browse files Browse the repository at this point in the history
Bump minor version
  • Loading branch information
quba42 authored Mar 4, 2024
2 parents b912625 + 09977d4 commit ecb7199
Show file tree
Hide file tree
Showing 22 changed files with 43 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.2.0.dev
current_version = 3.3.0.dev
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
Expand Down
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-316-g69ef1f6
2021.08.26-317-gde9891b
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} +
- name: Checkout plugin template
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: pulp/plugin_template
path: plugin_template
Expand All @@ -85,7 +85,7 @@ jobs:
git add -A
- name: Make a PR with version bump and without CHANGES/*
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
path: pulp_deb
token: ${{ secrets.RELEASE_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: python .ci/scripts/collect_changes.py

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.RELEASE_TOKEN }}
title: "Update Changelog"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
echo ::group::PYDEPS
pip install requests pyyaml
echo ::endgroup::
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
- name: "Update labels"
run: |
python3 .github/workflows/scripts/update_backport_labels.py
Expand Down
33 changes: 30 additions & 3 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
../plugin_template/scripts/update_ci.sh
- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v4"
uses: "peter-evans/create-pull-request@v6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulp_deb"
Expand All @@ -71,6 +71,33 @@ jobs:
[noissue]
delete-branch: true
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
path: "pulp_deb"
ref: "3.2"

- name: "Run update"
working-directory: "pulp_deb"
run: |
../plugin_template/scripts/update_ci.sh
- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulp_deb"
committer: "pulpbot <[email protected]>"
author: "pulpbot <[email protected]>"
title: "Update CI files for branch 3.2"
body: ""
branch: "update-ci/3.2"
base: "3.2"
commit-message: |
Update CI files
[noissue]
delete-branch: true
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
path: "pulp_deb"
Expand All @@ -82,7 +109,7 @@ jobs:
../plugin_template/scripts/update_ci.sh
- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v4"
uses: "peter-evans/create-pull-request@v6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulp_deb"
Expand All @@ -109,7 +136,7 @@ jobs:
../plugin_template/scripts/update_ci.sh
- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v4"
uses: "peter-evans/create-pull-request@v6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulp_deb"
Expand Down
1 change: 0 additions & 1 deletion CHANGES/1010.feature

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1010.removal

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1019.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1027.feature

This file was deleted.

3 changes: 0 additions & 3 deletions CHANGES/911.feature

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/919.misc

This file was deleted.

3 changes: 0 additions & 3 deletions CHANGES/921.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/970.misc

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/976.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/984.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/994.bugfix

This file was deleted.

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
# built documents.
#
# The short X.Y version.
version = "3.2.0.dev"
version = "3.3.0.dev"
# The full version, including alpha/beta/rc tags.
release = "3.2.0.dev"
release = "3.3.0.dev"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion pulp_deb/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ class PulpDebPluginAppConfig(PulpPluginAppConfig):

name = "pulp_deb.app"
label = "deb"
version = "3.2.0.dev"
version = "3.3.0.dev"
python_package_name = "pulp_deb"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name="pulp-deb",
version="3.2.0.dev",
version="3.3.0.dev",
description="pulp-deb plugin for the Pulp Project",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down
4 changes: 2 additions & 2 deletions template_config.yml
Original file line number Diff line number Diff line change
@@ -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 [email protected]316-g69ef1f6
# generated with [email protected]317-gde9891b

api_root: /pulp/
black: true
Expand Down Expand Up @@ -29,7 +29,7 @@ flake8_ignore: []
github_org: pulp
issue_tracker: github
kanban: false
latest_release_branch: null
latest_release_branch: '3.2'
lint_requirements: true
noissue_marker: '[noissue]'
parallel_test_workers: 8
Expand Down

0 comments on commit ecb7199

Please sign in to comment.