Merged

README.md

@@ -33,7 +33,7 @@ That's it. Along with the `setup.sh` script you find in this repo, the buildpack
 
 6. Clone the repository locally.
 
-7. Update the values in `setup.sh` accordingly (e.g. `HEROKU_TEAM_NAME`, `DEV_HUB_USERNAME`, `DEV_USERNAME`, `STAGING_USERNAME`, and `PROD_USERNAME`).
+7. Update the values in `setup.sh` accordingly (e.g. `HEROKU_TEAM_NAME`, `HEROKU_APP_NAME`, `DEV_HUB_USERNAME`, `DEV_USERNAME`, `STAGING_USERNAME`, and `PROD_USERNAME`).
 
 8. Create a developer-controlled package:
 

app.json

@@ -8,31 +8,45 @@
   "bugs": {
     "url": "https://github.com/wadewegner/salesforce-dx-pipeline-sample/issues"
   },
-  "homepage": "https://github.com/wadewegner/salesforce-dx-pipeline-sample#readme",
+  "homepage":
+    "https://github.com/wadewegner/salesforce-dx-pipeline-sample#readme",
   "dependencies": {},
   "devDependencies": {},
-  "buildpacks": [{
-    "url": "https://github.com/wadewegner/salesforce-cli-buildpack#v3"
-  }, {
-    "url": "https://github.com/wadewegner/salesforce-dx-buildpack#v3"
-  }],
+  "buildpacks": [
+    {
+      "url": "https://github.com/wadewegner/salesforce-cli-buildpack#v3"
+    },
+    {
+      "url": "https://github.com/wadewegner/salesforce-dx-buildpack#v3"
+    }
+  ],
   "env": {
     "DEV_HUB_SFDX_AUTH_URL": {
       "required": true
     },
-    "SFDX_BUILDPACK_DEBUG" : {
+    "SFDX_BUILDPACK_DEBUG": {
+      "required": true
+    },
+    "HEROKU_APP_NAME" : {
       "required": true
     }
   },
   "environments": {
     "test": {
       "scripts": {
-        "test-setup": "./vendor/sfdx/release.sh ci-$HEROKU_TEST_RUN_COMMIT_VERSION && ./bin/test-setup.sh",
+        "test-setup":
+          "./vendor/sfdx/release.sh ci-$HEROKU_TEST_RUN_COMMIT_VERSION && ./bin/test-setup.sh",
         "test": "./bin/test.sh"
       }
     }
   },
   "scripts": {
     "pr-predestroy": "./bin/ra-org-delete.sh"
+  },
+  "formation": {
+    "test": {
+      "quantity": 1,
+      "size": "standard-1x"
+    }
   }
 }

setup.sh

@@ -14,7 +14,10 @@ set -o nounset    # fail on unset variables
 TICKS=$(echo $(date +%s | cut -b1-13))
 
 # Name of your team (optional)
-HEROKU_TEAM_NAME="appcloud-dev" 
+HEROKU_TEAM_NAME="appcloud-dev"
+
+# Descriptive name for the Heroku app
+HEROKU_APP_NAME="MySuperLightningApp"
 
 # Name of the Heroku apps you'll use
 HEROKU_DEV_APP_NAME="dev$TICKS"
@@ -119,4 +122,5 @@ heroku ci:config:set -p $HEROKU_PIPELINE_NAME SFDX_AUTH_URL=$devSfdxAuthUrl
 heroku ci:config:set -p $HEROKU_PIPELINE_NAME SFDX_BUILDPACK_DEBUG=true
 heroku ci:config:set -p $HEROKU_PIPELINE_NAME SFDX_INSTALL_PACKAGE_VERSION=true
 heroku ci:config:set -p $HEROKU_PIPELINE_NAME SFDX_CREATE_PACKAGE_VERSION=false
-heroku ci:config:set -p $HEROKU_PIPELINE_NAME SFDX_PACKAGE_NAME="$PACKAGE_NAME"
+heroku ci:config:set -p $HEROKU_PIPELINE_NAME SFDX_PACKAGE_NAME="$PACKAGE_NAME"
+heroku ci:config:set -p $HEROKU_PIPELINE_NAME HEROKU_APP_NAME="$HEROKU_APP_NAME"