Skip to content
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
62 changes: 31 additions & 31 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,37 @@ jobs:
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
path: "pulpcore"
ref: "3.100"

- name: "Run update"
working-directory: "pulpcore"
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_100"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulpcore"
committer: "pulpbot <[email protected]>"
author: "pulpbot <[email protected]>"
title: "Update CI files for branch 3.100"
branch: "update-ci/3.100"
base: "3.100"
delete-branch: true
- name: "Mark PR automerge"
working-directory: "pulpcore"
run: |
gh pr merge --rebase --auto "${{ steps.create_pr_3_100.outputs.pull-request-number }}"
if: "steps.create_pr_3_100.outputs.pull-request-number"
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
Expand Down Expand Up @@ -229,35 +260,4 @@ jobs:
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
path: "pulpcore"
ref: "3.95"

- name: "Run update"
working-directory: "pulpcore"
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_95"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulpcore"
committer: "pulpbot <[email protected]>"
author: "pulpbot <[email protected]>"
title: "Update CI files for branch 3.95"
branch: "update-ci/3.95"
base: "3.95"
delete-branch: true
- name: "Mark PR automerge"
working-directory: "pulpcore"
run: |
gh pr merge --rebase --auto "${{ steps.create_pr_3_95.outputs.pull-request-number }}"
if: "steps.create_pr_3_95.outputs.pull-request-number"
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
...
2 changes: 0 additions & 2 deletions CHANGES/+improve-migration-err-msg.misc

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/5324.feature

This file was deleted.

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

This file was deleted.

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

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/plugin_api/6079.removal

This file was deleted.

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

name = "pulp_certguard.app"
label = "certguard"
version = "3.100.0.dev"
version = "3.101.0.dev"
python_package_name = "pulpcore"
domain_compatible = True
2 changes: 1 addition & 1 deletion pulp_file/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):

name = "pulp_file.app"
label = "file"
version = "3.100.0.dev"
version = "3.101.0.dev"
python_package_name = "pulpcore"
domain_compatible = True
2 changes: 1 addition & 1 deletion pulpcore/app/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig):
label = "core"

# The version of this app
version = "3.100.0.dev"
version = "3.101.0.dev"

# The python package name providing this app
python_package_name = "pulpcore"
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 = "pulpcore"
version = "3.100.0.dev"
version = "3.101.0.dev"
description = "Pulp Django Application and Related Modules"
readme = "README.md"
authors = [
Expand Down Expand Up @@ -204,7 +204,7 @@ ignore = [
[tool.bumpversion]
# This section is managed by the plugin template. Do not edit manually.

current_version = "3.100.0.dev"
current_version = "3.101.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
2 changes: 1 addition & 1 deletion template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ flake8: true
flake8_ignore:
- ./pulpcore/app/protobuf/*
github_org: pulp
latest_release_branch: '3.95'
latest_release_branch: '3.100'
lint_requirements: true
os_required_packages: []
parallel_test_workers: 8
Expand Down