Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump minor version #1936

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-421-g204a709
unknown
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
test:
if: "endsWith(github.base_ref, 'main')"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"
defaults:
run:
working-directory: "pulp_container"
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:

no-test:
if: "!endsWith(github.base_ref, 'main')"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"
steps:
- run: |
echo "Skip docs testing on non-main branches."
14 changes: 7 additions & 7 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_container"
ref: "2.23"
ref: "2.24"

- name: "Run update"
working-directory: "pulp_container"
Expand All @@ -242,21 +242,21 @@ jobs:

- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v6"
id: "create_pr_2_23"
id: "create_pr_2_24"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulp_container"
committer: "pulpbot <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
title: "Update CI files for branch 2.23"
branch: "update-ci/2.23"
base: "2.23"
title: "Update CI files for branch 2.24"
branch: "update-ci/2.24"
base: "2.24"
delete-branch: true
- name: "Mark PR automerge"
working-directory: "pulp_container"
run: |
gh pr merge --rebase --auto "${{ steps.create_pr_2_23.outputs.pull-request-number }}"
if: "steps.create_pr_2_23.outputs.pull-request-number"
gh pr merge --rebase --auto "${{ steps.create_pr_2_24.outputs.pull-request-number }}"
if: "steps.create_pr_2_24.outputs.pull-request-number"
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
Expand Down
2 changes: 0 additions & 2 deletions CHANGES/domain-enablement.feature

This file was deleted.

2 changes: 1 addition & 1 deletion pulp_container/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):

name = "pulp_container.app"
label = "container"
version = "2.24.0.dev"
version = "2.25.0.dev"
python_package_name = "pulp-container"
domain_compatible = True

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = "pulp-container"
version = "2.24.0.dev"
version = "2.25.0.dev"
description = "Container plugin for the Pulp Project"
readme = "README.md"
authors = [
Expand Down Expand Up @@ -87,7 +87,7 @@ ignore = [
[tool.bumpversion]
# This section is managed by the plugin template. Do not edit manually.

current_version = "2.24.0.dev"
current_version = "2.25.0.dev"
commit = false
tag = false
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
Expand Down
4 changes: 2 additions & 2 deletions template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ docker_fixtures: false
flake8: true
flake8_ignore: []
github_org: pulp
latest_release_branch: '2.23'
latest_release_branch: '2.24'
lint_requirements: true
os_required_packages: []
parallel_test_workers: 8
Expand Down Expand Up @@ -58,9 +58,9 @@ pulp_settings_azure:
flatpak_index: true
pulp_settings_gcp: null
pulp_settings_s3:
domain_enabled: true
flatpak_index: false
token_auth_disabled: true
domain_enabled: true
pydocstyle: true
release_email: pulp-infra@redhat.com
release_user: pulpbot
Expand Down