Skip to content
Snippets Groups Projects
Commit 9b6b00da authored by totten's avatar totten
Browse files

Update 5.x-rc.md

parent 4ffebdad
No related branches found
No related tags found
No related merge requests found
......@@ -21,47 +21,25 @@ See [Prerequisites](any-prereq.md)
* https://test.civicrm.org/job/CiviCRM-E2E-Matrix/
* https://test.civicrm.org/job/CiviCRM-D8-Matrix/
## 2: Bump version number on `master` to `5.X.beta1`
## 2: Update versions and create branches
```bash
cd ~/src/master
forkify pull -A --ff-only master origin/master
./tools/bin/scripts/set-version.php 5.X.beta1 --commit
git push origin master
```
## 3: Make a branch
For each git repo, we want to create a new branch for 5.X.
| repo | folder| original branch | new branch |
|------|-------|-----------------|------------|
|civicrm-core|./|master|5.X|
|civicrm-packages|./packages/|master|5.X|
|civicrm-backdrop|./backdrop/|1.x-master|1.x-5.X|
|civicrm-drupal|./drupal/|6.x-master|6.x-5.X|
|civicrm-drupal|./drupal/|7.x-master|7.x-5.X|
|civicrm-drupal-8|./drupal-8/|master|5.X|
|civicrm-joomla|./joomla/|master|5.X|
|civicrm-wordpress|./WordPress/|master|5.X|
We will raise the version numbers and create branches on each CiviCRM repository.
If you don't already have the repos in the correct folders, then you can:
This requires a working directory with copies of every core repository (ie `civicrm-core`, `civicrm-packages`, `civicrm-backdrop`, etc). If you don't already have one, then either:
* Create a suitable project (`civibuild create dist`) and look in `build/dist/src`, or...
* Create a project (`civibuild create dist`) and use `build/dist/src/`, or...
* Login to `latest.civicrm.org` and use `~/src/master`.
Either way, you should get the current code and create the branches:
The script `givi wf:rc` will perform the necessary updates:
```bash
cd ~/src/master
forkify -A fetch origin
forkify -A branch 5.X origin/master
forkify -A push -u origin 5.X
givi wf:rc
```
> TIP: `forkify` can provide a preview (`--dry-run` aka `-N`) or an interactive confirmation (`--step` aka `-S`).
> TIP: `givi` can provide a preview (`--dry-run` aka `-N`) or an interactive confirmation (`--step` aka `-S`).
## 4: Setup automated processes
## 3: Setup automated processes
* Go to https://test.civicrm.org/job/CiviCRM-Core-Matrix/configure
* In the list of `CIVIVER`s, remove any old RC's. Add the current RC. (ex: `4.6 5.X master`)
......@@ -80,22 +58,10 @@ forkify -A push -u origin 5.X
* Go to https://test.civicrm.org/job/CiviCRM-Publish-Schedule/configure
* In the list of `branchNames`, remove any old RC's. Add the current RC. (ex: `master 4.6 5.X`)
## 5: Publish tarballs
## 4: Publish tarballs
* Go to https://test.civicrm.org/job/CiviCRM-Publish/
* Check to see if the new branch is being built automatically. If not:
* Login (if you haven't already)
* Click "Build with parameters"
* For the branch name, enter your chosen `5.X`.
## 6: Bump version number on `master` to `5.Y.alpha1`
The original branch, "master", should continue development with the next version, e.g. "5.Y".
```bash
cd ~/src/master
git checkout master
git pull --ff-only origin master
./tools/bin/scripts/set-version.php 5.Y.alpha1 --commit
git push origin master
```
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment