diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml index 3fbef48..2eae2f9 100644 --- a/.github/workflows/beta_release.yml +++ b/.github/workflows/beta_release.yml @@ -70,4 +70,26 @@ jobs: run: sf package install -p ${{ steps.createPackageVersion.outputs.packageVersionId }} -w 10 -o scratch-org -r # Housekeeping - name: 'Delete scratch org' - run: sf org delete scratch -p -o scratch-org \ No newline at end of file + run: sf org delete scratch -p -o scratch-org + + # Pull Request commit generated Package Id in sfdx-package.json file. + - name: Create Pull Request + id: create-pr + uses: peter-evans/create-pull-request@v6 + with: + title: 'Bump package version to ${{ steps.createPackageVersion.outputs.packageVersionId }}' + body: | + This pull request updates the package version to ${{ steps.createPackageVersion.outputs.packageVersionId }}. + branch: 'bump-package-version-${{ steps.createPackageVersion.outputs.packageVersionId }}' + commit-message: 'chore: bump package version to ${{ steps.createPackageVersion.outputs.packageVersionId }}' + labels: 'dependencies, automated pr' + token: ${{ secrets.GITHUB_TOKEN }} + + # Approve and mark PR for auto merge + - name: 'Approve and mark PR for auto merge' + run: | + gh pr review --approve "$PR_NUMBER" + gh pr merge --auto --squash --delete-branch "$PR_NUMBER" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_NUMBER: ${{ steps.create-pr.outputs.pull-request-number }} \ No newline at end of file diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json index 9922ac6..2566341 100644 --- a/config/project-scratch-def.json +++ b/config/project-scratch-def.json @@ -1,7 +1,7 @@ { "orgName": "Salesforce Impact Labs", "edition": "Developer", - "features": ["EnableSetPasswordInApi","AuthorApex", "EinsteinHawkingC2CEnabled", "EinsteinGPT"], + "features": ["EnableSetPasswordInApi","AuthorApex"], "settings": { "lightningExperienceSettings": { "enableS1DesktopEnabled": true diff --git a/sfdx-project.json b/sfdx-project.json index 3541dee..5b3f820 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -4,8 +4,8 @@ "path": "force-app", "default": true, "package": "Grants Content Kit", - "versionName": "Winter 24", - "versionNumber": "2.1.0.NEXT", + "versionName": "Spring 24", + "versionNumber": "3.1.0.NEXT", "apexTestAccess": { "permissionSets": [ "GGW_User_Permissions" @@ -18,7 +18,7 @@ "sfdcLoginUrl": "https://login.salesforce.com", "sourceApiVersion": "54.0", "packageAliases": { - "Grants Content Kit": "0Ho8a000000fxV5CAI", + "Grants Content Kit": "0Ho8a0000008OTFCA2", "Grants Content Kit@0.1.0-1": "04t8a000001aJXYAA2", "Grants Content Kit@0.1.0-2": "04t8a000001aJYWAA2", "Grants Content Kit@0.1.0-3-main": "04t8a000001B8qcAAC",