Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

Test Pull request to eval what happens #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions config/project-scratch-def.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"orgName": "Company",
"edition": "Developer",
"orgPreferences" : {
"enabled": ["S1DesktopEnabled"]
"settings": {
"orgPreferenceSettings": {
"s1DesktopEnabled": true
}
}
}
}
7 changes: 5 additions & 2 deletions force-app/main/default/classes/DemoController.cls
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
public with sharing class DemoController {

private String appVersion = '1.0.0';

/**
* An empty constructor for the testing
*/
Expand All @@ -8,6 +11,6 @@ public with sharing class DemoController {
* Get the version of the SFDX demo app
*/
public String getAppVersion() {
return '1.0.0';
return appVersion;
}
}
}
11 changes: 6 additions & 5 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
HEROKU_TEAM_NAME=""

# Descriptive name for the Heroku app
HEROKU_APP_NAME="YOUR_APP_NAME"
HEROKU_APP_NAME="sfdc2019jef"

# Name of the Heroku apps you'll use
HEROKU_DEV_APP_NAME="$HEROKU_APP_NAME-dev"
HEROKU_STAGING_APP_NAME="$HEROKU_APP_NAME-staging"
HEROKU_PROD_APP_NAME="$HEROKU_APP_NAME-prod"


# Pipeline
HEROKU_PIPELINE_NAME="$HEROKU_APP_NAME-pipeline"

Expand All @@ -30,7 +31,7 @@ STAGING_USERNAME="TestOrg"
PROD_USERNAME="ProdOrg"

# Your package name from force:package:list
PACKAGE_NAME="YOUR_PACKAGE_NAME"
PACKAGE_NAME="SamplePkg1"

# Repository with your code (username/repo)
# Only specify a value if you have already connected your GitHub account with Heroku,
Expand Down Expand Up @@ -103,7 +104,7 @@ fi

# Setup sfdxUrl for Dev Org auth
devSfdxAuthUrl=$(sfdx force:org:display --verbose -u $DEV_USERNAME | grep "Sfdx Auth Url" | awk '{ print $4 }')
if [[ "$devSfdxAuthUrl" =~ ^force://.*\.salesforce\.com$ ]]; then
if [[ "$devSfdxAuthUrl" =~ ^force://.*\.salesforce\.com/$ ]]; then
heroku config:set SFDX_AUTH_URL=$devSfdxAuthUrl -a $HEROKU_DEV_APP_NAME
else
echo ""
Expand All @@ -114,7 +115,7 @@ fi

# Setup sfdxUrl for Staging Org auth
stagingSfdxAuthUrl=$(sfdx force:org:display --verbose -u $STAGING_USERNAME | grep "Sfdx Auth Url" | awk '{ print $4 }')
if [[ "$stagingSfdxAuthUrl" =~ ^force://.*\.salesforce\.com$ ]]; then
if [[ "$stagingSfdxAuthUrl" =~ ^force://.*\.salesforce\.com/$ ]]; then
heroku config:set SFDX_AUTH_URL=$stagingSfdxAuthUrl -a $HEROKU_STAGING_APP_NAME
else
echo ""
Expand All @@ -125,7 +126,7 @@ fi

# Setup sfdxUrl for Prod Org auth
prodSfdxAuthUrl=$(sfdx force:org:display --verbose -u $PROD_USERNAME | grep "Sfdx Auth Url" | awk '{ print $4 }')
if [[ "$prodSfdxAuthUrl" =~ ^force://.*\.salesforce\.com$ ]]; then
if [[ "$prodSfdxAuthUrl" =~ ^force://.*\.salesforce\.com/$ ]]; then
heroku config:set SFDX_AUTH_URL=$prodSfdxAuthUrl -a $HEROKU_PROD_APP_NAME
else
echo ""
Expand Down
18 changes: 16 additions & 2 deletions sfdx-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,24 @@
"packageDirectories": [
{
"path": "force-app",
"default": true
"default": true,
"package": "SamplePkg",
"versionName": "ver 0.1",
"versionNumber": "0.1.0.NEXT"
},
{
"path": "force-app",
"package": "SamplePkg1",
"versionName": "ver 0.1",
"versionNumber": "0.1.0.NEXT",
"default": false
}
],
"namespace": "",
"sfdcLoginUrl": "https://login.salesforce.com",
"sourceApiVersion": "43.0"
"sourceApiVersion": "43.0",
"packageAliases": {
"SamplePkg": "0Ho4P000000XZCXSA4",
"SamplePkg1": "0Ho4P000000XZCcSAO"
}
}