-
Notifications
You must be signed in to change notification settings - Fork 21
Updating Swift cfenv
Whenever updates are made to the Swift-cfenv package, please make sure you also update the swift-helloworld repo, which can be found at: https://github.com/IBM-Bluemix/swift-helloworld.
We keep the master branches for these two repos (i.e. Swift-cfenv and swift-helloworld) compatible with the latest Swift version supported by the Swift buildpack currently installed on Bluemix. Now, the develop branches for these two repos may be compatible with a newer version of the Swift binaries. The following table captures this:
| Swift-cfenv | swift-helloworld | Version | Comment |
|---|---|---|---|
| master | master | Compatible with the Swift version supported by the Swift buildpack installed on Bluemix | Should be compatible with each other |
| develop | develop | Compatible with a newer Swift version than version supported by master | Should be compatible with each other |
Please note that both repos are setup for continuous integration using Travis CI.
When you make changes to the repos, please use your own branch to test your changes before putting them into the develop branch. You can follow the following steps to create your own branch:
$ git checkout develop
$ git pull
This makes sure you have the latest changes from the develop branch.
$ git checkout -b issue.{your branch name}
$ git push --set-upstream origin issue.{your branch name}
This creates your branch on GitHub.
$ {make you change}
$ git commit -m "Your comment here"
$ git push
That will commit your changes locally and push them up to GitHub for the Travis CI build to pick up.
No need to update the .travis.yml file to enable building your branch. It has a regular expression in it to handle your branch name:
branches:
only:
- master
- develop
- /^issue.*$/
To check on the Travis CI build, go to the following URL:
- https://travis-ci.org/IBM-Swift/Swift-cfenv/branches
- https://travis-ci.org/IBM-Bluemix/swift-helloworld/branches
You should see your branch there and you can checkout the status of the build.
Finally, when a new version of the Swift-cfenv should be made available for consumption, please make sure that new GitHub tag along with a new release version are specified.