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
1 change: 0 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- "main"
- "4.x-dev"
pull_request: null
# build weekly at 4:00 AM UTC
schedule:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/update_pr_references.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- 4.x-dev

jobs:
update_pr_numbers_in_change_fragments:
Expand Down
22 changes: 0 additions & 22 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,3 @@ or create the release via the GitHub CLI
changes and a link to the GitHub release page.
(If the Globus CLI is releasing within a short interval,
combine both announcements into a single email notice.)

- Ensure the 4.x-dev branch is updated with the latest changes from main
by creating a PR:
```
git checkout 4.x-dev
git pull
git checkout -b merge-main-to-4x-dev-$(date +%Y%m%d)
git merge origin/main
# Resolve any conflicts if they occur
git push -u origin merge-main-to-4x-dev-$(date +%Y%m%d)
gh pr create --base 4.x-dev --title "Merge main into 4.x-dev" \
--body "Merging latest changes from main branch into 4.x-dev"
```
After the PR is reviewed and merged, the 4.x-dev branch will be updated.

## Publish Pre-release 4.x packages to PyPi

The steps above for deploying a package to PyPI can be used to push pre-release packages by:

* Using the 4.x-dev branch instead of the main branch
* Creating and pushing a tag on the 4.x-dev branch
* Publishing the release through GitHub using the 4.x-dev branch