Merge branch 'master' into v4-dev

README.md

@@ -1,6 +1,8 @@
 # salesforce-dx-pipeline-sample
 
-Using this sample app and the resources in this repo, you can setup a Heroku Pipeline to drive CI / CD for Salesforce DX using Unlocked Packages. This sample uses the [salesforce-dx-buildpack](https://github.com/wadewegner/salesforce-dx-buildpack) and the [salesforce-cli-buildpack](https://github.com/wadewegner/salesforce-cli-buildpack).
+This sample uses unlocked second generation packages (2GPs) to deploy project updates. If you're looking to perform metadata deploys instead, please use [https://github.com/wadewegner/salesforce-dx-pipeline-mdapi-sample](https://github.com/wadewegner/salesforce-dx-pipeline-mdapi-sample).
+
+Using this sample app and the resources in this repo, you can setup a Heroku Pipeline to drive CI / CD for Salesforce DX. This sample uses the [salesforce-dx-buildpack](https://github.com/wadewegner/salesforce-dx-buildpack) and the [salesforce-cli-buildpack](https://github.com/wadewegner/salesforce-cli-buildpack).
 
 ![image](https://user-images.githubusercontent.com/746259/36068129-5c8a19b2-0e82-11e8-96b5-a9fed295a33d.png)
 
@@ -41,7 +43,7 @@ That's it. Along with the `setup.sh` script you find in this repo, the buildpack
 sfdx force:package2:create -n PipelineSamplePackage - "My package yo" -o Unlocked -e
 ```
 
-9. Update the `sfdx-project.json` and inclu
+9. Update the `sfdx-project.json` to use your package ID.
 
 8. Run `./setup.sh`.
 

bin/post-setup.sh

@@ -4,6 +4,4 @@ TARGET_ORG_ALIAS=${1:-}
 STAGE=${2:-}
 
 ### Not required
-### This script will execute after the org has been setup
-
-echo "hello from post-setup.sh"
+### This script will execute after the org has been setup

setup.sh

@@ -105,9 +105,9 @@ heroku buildpacks:add -i 1 https://github.com/wadewegner/salesforce-cli-buildpac
 heroku buildpacks:add -i 1 https://github.com/wadewegner/salesforce-cli-buildpack -a $HEROKU_STAGING_APP_NAME
 heroku buildpacks:add -i 1 https://github.com/wadewegner/salesforce-cli-buildpack -a $HEROKU_PROD_APP_NAME
 
-heroku buildpacks:add -i 2 https://github.com/wadewegner/salesforce-dx-buildpack -a $HEROKU_DEV_APP_NAME
-heroku buildpacks:add -i 2 https://github.com/wadewegner/salesforce-dx-buildpack -a $HEROKU_STAGING_APP_NAME
-heroku buildpacks:add -i 2 https://github.com/wadewegner/salesforce-dx-buildpack -a $HEROKU_PROD_APP_NAME
+heroku buildpacks:add -i 2 https://github.com/wadewegner/salesforce-dx-buildpack#v4-dev -a $HEROKU_DEV_APP_NAME
+heroku buildpacks:add -i 2 https://github.com/wadewegner/salesforce-dx-buildpack#v4-dev -a $HEROKU_STAGING_APP_NAME
+heroku buildpacks:add -i 2 https://github.com/wadewegner/salesforce-dx-buildpack#v4-dev -a $HEROKU_PROD_APP_NAME
 
 # Create Pipeline
 # Valid stages: "test", "review", "development", "staging", "production"

sfdx-project.json

@@ -10,5 +10,5 @@
   ],
   "namespace": "",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "41.0"
-}
+  "sourceApiVersion": "42.0"
+}