@@ -17,14 +17,14 @@ GASNet Release Procedure
1717 to remove untracked files. Otherwise it's very easy for stray files to end
1818 up in the release.
1919
20- * Under normal circumstances you will generating a release on the 'master '
20+ * Under normal circumstances you will generating a release on the 'main '
2121 branch after use of a "release branch" to merge in all the new work from
2222 'develop' and update version numbers, etc. This procedure begins with the
2323 creation of the "release branch" for a hypothetical 2040.8.0 release:
2424 $ git checkout -b release/2040.8.0 develop
2525
2626* To allow collaboration on the release work, one may optionally "publish"
27- the release branch on bitbucket :
27+ the release branch on GitHub :
2828 $ git push -u origin release/2040.8.0
2929
3030* Increment the version number for each item or software module that has
@@ -150,30 +150,30 @@ GASNet Release Procedure
150150
151151* Clone a *second* copy of the repository for the tools-only distribution:
152152 $ git clone --branch release/2040.8.0 \
153- https://bitbucket.org/berkeleylab /gasnet gasnet-tools
153+ https://github.com/BerkeleyLab /gasnet gasnet-tools
154154 $ cd gasnet-tools
155155 $ ./Bootstrap -o
156156 make a separate build directory, configure and "gmake all distcheck"
157157 to build the tools-only tarball.
158- The use of the URL for anonymous access to BitBucket is INTENTIONAL,
158+ The use of the URL for anonymous access to GitHub is INTENTIONAL,
159159 so that you cannot accidentally commit the re-writes done by the
160160 "-o" option to ./Bootstrap.
161161
162162* Iterate the appropriate steps above until you have final release
163163 tarballs for both GASNet and GASNet_Tools
164164
165165* Before merging the release branch be sure you have up-to-date clones of both
166- 'master ' and 'develop'. While it is unlikely that 'master ' has changed since
166+ 'main ' and 'develop'. While it is unlikely that 'main ' has changed since
167167 you began, concurrent development on 'develop' should be considered normal.
168168 Since you haven't committed anything to either branch in your local repo,
169169 the following should be safe:
170170 $ git checkout develop
171171 $ git pull --ff-only
172- $ git checkout master
172+ $ git checkout main
173173 $ git pull --ff-only
174174
175175* Advanced warning #1:
176- If there were any "hot fixes" on 'master ' since the previous release
176+ If there were any "hot fixes" on 'main ' since the previous release
177177 then you will may need to resolve conflicts in the "git ... finish ..." or
178178 "git merge ..." step below. If you are motivated to accept any conflict
179179 resolution other than "-X theirs" (meaning: "use the release branch in the
@@ -187,23 +187,23 @@ GASNet Release Procedure
187187 you will need to take extra steps to deal with this. The preferred sequence
188188 would be create/rebase the release branch prior to the introduction of the
189189 problematic feature. If this is not possible, then fix things up on the release
190- branch before it is merged to 'master ', and consider skipping the release
190+ branch before it is merged to 'main ', and consider skipping the release
191191 branch merge to develop. Individual unrelated improvements on the release
192192 branch can instead be cherry-picked to develop.
193193
194- * Now merge the release branch to 'master ' (where the general public will
194+ * Now merge the release branch to 'main ' (where the general public will
195195 expect to find sources intended for general consumption), tag the release,
196- and delete the transient release branch. (We no longer merge master back
196+ and delete the transient release branch. (We no longer merge main back
197197 to develop, due to lack of perceived benefit).
198- $ git checkout master
198+ $ git checkout main
199199 $ git merge --edit --no-ff release/2040.8.0
200- $ git tag -a gex-2040.8.0 -m "GASNet release 2040.8.0" master
200+ $ git tag -a gex-2040.8.0 -m "GASNet release 2040.8.0" main
201201
202202* Check the tag landed in the correct place as follows:
203203 $ git show gex-2040.8.0
204204 The output should show the commit message for the *merge*. If it shows any
205205 of the earlier commits, move it using "--force":
206- $ git tag --force -a gex-2040.8.0 -m "GASNet release 2040.8.0" master
206+ $ git tag --force -a gex-2040.8.0 -m "GASNet release 2040.8.0" main
207207 OR, just "--force" it without checking - this is perfectly safe.
208208
209209* Bump package patch version to .1 on develop and create annotated tag
@@ -217,10 +217,10 @@ GASNet Release Procedure
217217 20XX-YY-ZZ: PENDING
218218
219219* Check carefully that everything is exactly as you wish before you push:
220- $ git push origin master gex-2040.8.0
220+ $ git push origin main gex-2040.8.0
221221 This is the only step of this entire procedure that cannot be undone.
222222
223- * If you chose to "publish" the release branch on bitbucket , then use the
223+ * If you chose to "publish" the release branch on GitHub , then use the
224224 following command to delete the (now unused) release branch:
225225 $ git push --delete origin release/2040.8.0
226226
@@ -231,10 +231,10 @@ GASNet Release Procedure
231231 release tag.
232232
233233* If the GASNet or tools spec versions have changed, they get tags too:
234- $ git tag gex-spec-2.1 master
234+ $ git tag gex-spec-2.1 main
235235 $ git push origin gex-spec-2.1
236236 and/or
237- $ git tag gasnet-tools-spec-1.32 master
237+ $ git tag gasnet-tools-spec-1.32 main
238238 $ git push origin gasnet-tools-spec-1.32
239239
240240* In Bugzilla (before publishing the release):
@@ -404,7 +404,7 @@ Snapshot Releases
404404
405405--------------------------------------------------------------------------
406406 The canonical version of this document is located here:
407- https://bitbucket.org/berkeleylab /gasnet/src /develop/README-release
407+ https://github.com/BerkeleyLab /gasnet/blob /develop/README-release
408408
409409 For more information, please email: gasnet-devel@lbl.gov
410410 or visit the GASNet home page at: https://gasnet.lbl.gov
0 commit comments