Skip to content

Commit 0986ab0

Browse files
committed
Drop 2.15 from supported branches
1 parent 21d2768 commit 0986ab0

3 files changed

Lines changed: 2 additions & 33 deletions

File tree

.github/workflows/scripts/release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ towncrier build --yes --version "${NEW_VERSION}"
2424
bump-my-version bump release --commit --message "Release {new_version}" --tag --tag-name "{new_version}" --tag-message "Release {new_version}" --allow-dirty
2525
bump-my-version bump patch --commit
2626

27-
git push origin "${BRANCH}" "${NEW_VERSION}"
27+
# Git push is not atomic by default!
28+
git push --atomic origin "${BRANCH}" "${NEW_VERSION}"

.github/workflows/update_ci.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -72,37 +72,6 @@ jobs:
7272
env:
7373
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
7474
continue-on-error: true
75-
- uses: "actions/checkout@v6"
76-
with:
77-
fetch-depth: 0
78-
path: "pulp_container"
79-
ref: "2.15"
80-
81-
- name: "Run update"
82-
working-directory: "pulp_container"
83-
run: |
84-
../plugin_template/scripts/update_ci.sh --release
85-
86-
- name: "Create Pull Request for CI files"
87-
uses: "peter-evans/create-pull-request@v8"
88-
id: "create_pr_2_15"
89-
with:
90-
token: "${{ secrets.RELEASE_TOKEN }}"
91-
path: "pulp_container"
92-
committer: "pulpbot <pulp-infra@redhat.com>"
93-
author: "pulpbot <pulp-infra@redhat.com>"
94-
title: "Update CI files for branch 2.15"
95-
branch: "update-ci/2.15"
96-
base: "2.15"
97-
delete-branch: true
98-
- name: "Mark PR automerge"
99-
working-directory: "pulp_container"
100-
run: |
101-
gh pr merge --rebase --auto "${{ steps.create_pr_2_15.outputs.pull-request-number }}"
102-
if: "steps.create_pr_2_15.outputs.pull-request-number"
103-
env:
104-
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
105-
continue-on-error: true
10675
- uses: "actions/checkout@v6"
10776
with:
10877
fetch-depth: 0

template_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ stalebot_days_until_close: 30
104104
stalebot_days_until_stale: 90
105105
stalebot_limit_to_pulls: true
106106
supported_release_branches:
107-
- "2.15"
108107
- "2.19"
109108
- "2.20"
110109
- "2.22"

0 commit comments

Comments
 (0)