@@ -34,7 +34,7 @@ In this step, we will prepare the local repository to build from as well as upda
### Part D: Create a Pull Request
* Make a pull request with your local changes into the `dev` branch of the repository. If there is already a version branch (ex: 3.10) for this release, after the change is PR'd into `dev`, cherry-pick it into the version branch for your release, and make a pull request with this change, as well. Make sure any other changes needed for the release have also been cherry-picked into this branch.
### Part E: Create a Release Version Branch
### Part E: Create a Version Branch
Once the PR has been reviewed and merged:
If this is the first Release Candidate for a version, or if there is not already a branch for this version for any other reason, you will need to create a branch for this release. Branches are created for each minor (i.e. 3.x or 4.x) version of ISIS, and each then specific release is associated with a minor version (i.e. 3.x.x or 4.x.x) tag on that version branch.
@@ -79,9 +79,9 @@ Anaconda leverages caching in many places which can cause issues. If you are get
### Part C: Run the Build
* Go to the root of the repository you set up in [Step 2 Part A](#Part_A:_Setup_Repository). Make sure it is up to date.
* Switch to the release branch you created earlier in [Step 2 Part E](### Part E: Create a Release Branch)
```git checkout <release branch>```
* Ensure you are at the head of the release branch ```git pull upstream <release branch>```
* Switch to the appropriate version branch
```git checkout <version branch>```
* Ensure you are at the head of the release branch ```git pull upstream <version branch>```
* Run ```conda build recipe/ -c usgs-astrogeology -c conda-forge --no-test```
* The -c options are to give conda a channel priority. Without these, conda will always attempt to download from the default Anaconda channel first. (Unlike the environment.yml files, channel priority cannot be defined within the meta.yaml.)
* Since we do not have testing set-up through conda, the “--no-test” flag must be set in order to avoid errors. (By default, conda looks for a run_test file and will throw an error if it can not be located.)
