diff --git a/.github/workflows/pullrequest_build.yml b/.github/workflows/pullrequest_build.yml index a98f4ff..95b98ce 100644 --- a/.github/workflows/pullrequest_build.yml +++ b/.github/workflows/pullrequest_build.yml @@ -1,12 +1,12 @@ -name: PR Checks -run-name: Checks running whenever new PR is created +name: PR validation +run-name: Runs unit tests before allowing PR to dev to be merged on: pull_request: branches: - dev - - main paths-ignore: - 'docs/*' + - '.github/*' - '.github/workflows/*' jobs: diff --git a/.github/workflows/main_merged.yml b/.github/workflows/pullrequest_release.yml similarity index 76% rename from .github/workflows/main_merged.yml rename to .github/workflows/pullrequest_release.yml index 0495b5b..8be4833 100644 --- a/.github/workflows/main_merged.yml +++ b/.github/workflows/pullrequest_release.yml @@ -1,10 +1,10 @@ -name: Build new package -run-name: Builds a new package whenever PR gets merged to main +name: Create new package version +run-name: Creates new package version whenever PR gets merged to dev branch on: pull_request: types: [closed] branches: - - main + - dev jobs: build: @@ -45,15 +45,15 @@ jobs: STATUS=$(echo $JSON | jq '.result.Status'); ID=$(echo $JSON | jq -r '.result.Id'); - # Promoting a new package version - - name: Promoting a new package version - run: | - if [ $STATUS = "\"Success\"" ]; - then - sf package version promote --package $ID - else - echo "Unable to promote package since package version create has failed"; - fi + # Promoting a new package version (removed since main branch will no longer be used) + # - name: Promoting a new package version + # run: | + # if [ $STATUS = "\"Success\"" ]; + # then + # sf package version promote --package $ID + # else + # echo "Unable to promote package since package version create has failed"; + # fi # Listing all package versions - name: List package versions diff --git a/sfdx-project.json b/sfdx-project.json index e46a343..baebe1a 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -13,11 +13,5 @@ "name": "GameForce", "namespace": "GameForce", "sfdcLoginUrl": "https://login.salesforce.com", - "sourceApiVersion": "59.0", - "packageAliases": { - "GameForce": "0Ho69000000GmhUCAS", - "GameForce@1.0.0-2": "04t690000018a2HAAQ", - "GameForce@1.0.0-3": "04t690000018a2MAAQ", - "GameForce@1.0.0-4": "04t690000018a2RAAQ" - } + "sourceApiVersion": "59.0" } \ No newline at end of file