diff --git a/.github/workflows/scripts/release.sh b/.github/workflows/scripts/release.sh index a08353cdb..40bbcb198 100755 --- a/.github/workflows/scripts/release.sh +++ b/.github/workflows/scripts/release.sh @@ -24,4 +24,5 @@ towncrier build --yes --version "${NEW_VERSION}" bump-my-version bump release --commit --message "Release {new_version}" --tag --tag-name "{new_version}" --tag-message "Release {new_version}" --allow-dirty bump-my-version bump patch --commit -git push origin "${BRANCH}" "${NEW_VERSION}" +# Git push is not atomic by default! +git push --atomic origin "${BRANCH}" "${NEW_VERSION}" diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 4f11c6e8b..33448c635 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -72,37 +72,6 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true - - uses: "actions/checkout@v6" - with: - fetch-depth: 0 - path: "pulp_container" - ref: "2.15" - - - name: "Run update" - working-directory: "pulp_container" - run: | - ../plugin_template/scripts/update_ci.sh --release - - - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v8" - id: "create_pr_2_15" - with: - token: "${{ secrets.RELEASE_TOKEN }}" - path: "pulp_container" - committer: "pulpbot " - author: "pulpbot " - title: "Update CI files for branch 2.15" - branch: "update-ci/2.15" - base: "2.15" - delete-branch: true - - name: "Mark PR automerge" - working-directory: "pulp_container" - run: | - gh pr merge --rebase --auto "${{ steps.create_pr_2_15.outputs.pull-request-number }}" - if: "steps.create_pr_2_15.outputs.pull-request-number" - env: - GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" - continue-on-error: true - uses: "actions/checkout@v6" with: fetch-depth: 0 diff --git a/template_config.yml b/template_config.yml index 72fe5a44a..20b84a1fb 100644 --- a/template_config.yml +++ b/template_config.yml @@ -104,7 +104,6 @@ stalebot_days_until_close: 30 stalebot_days_until_stale: 90 stalebot_limit_to_pulls: true supported_release_branches: - - "2.15" - "2.19" - "2.20" - "2.22"