From 8a6e7a37aad0e8d3f0d098dfaf59fd7d5ade8867 Mon Sep 17 00:00:00 2001 From: William Velzeboer <6429417+wimvelzeboer@users.noreply.github.com> Date: Mon, 30 Mar 2026 12:27:12 +0100 Subject: [PATCH] Fix pipeline git push issue (#84) * Fix pipeline git push issue * Add Install instructions * New package version 0.3.0-1-bugfix/pipelineFix2 created --- .github/workflows/deploy.and.test.yml | 7 ------- .github/workflows/publish.yml | 16 +++++++++++----- README.md | 14 ++++++++++++-- sfdx-project.json | 7 ++++--- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy.and.test.yml b/.github/workflows/deploy.and.test.yml index c1ddffb..72eec4b 100644 --- a/.github/workflows/deploy.and.test.yml +++ b/.github/workflows/deploy.and.test.yml @@ -80,13 +80,6 @@ jobs: echo "PACKAGE_ID=$VERSION_ID" >> "$GITHUB_ENV" echo "PACKAGE_VERSION=$VERSION" >> "$GITHUB_ENV" - - name: Appending to package version log - run: | - DT=$(date '+%d/%m/%Y %H:%M:%S'); - echo "|$PACKAGE_VERSION (BETA) | $PACKAGE_ID | Created on $DT |" >> README.md - git add README.md - git commit -am "Update Package Version Log with $PACKAGE_VERSION-Beta" - - name: Push changes to GIT run: | git push \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 42ccb1a..22ce98b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -76,17 +76,23 @@ jobs: echo "Increasing package versionNumber" NEW_PACKAGE_VERSION=`echo "$(echo "$NEW_PACKAGE_VERSION_NAME" | cut -d ' ' -f2).0.NEXT"` - echo "Current package version name: $PACKAGE_VERSION" - echo "New package version name: $NEW_PACKAGE_VERSION" + echo "Current package version: $PACKAGE_VERSION" + echo "New package version: $NEW_PACKAGE_VERSION" cat sfdx-project.json | jq -r --arg VERSION "$NEW_PACKAGE_VERSION" '.packageDirectories |= map(select(.package == "fflibApexExtensions").versionNumber = $VERSION)' > tmp.json mv tmp.json sfdx-project.json echo "NEW_PACKAGE_VERSION_NAME=$NEW_PACKAGE_VERSION_NAME" >> "$GITHUB_ENV" echo "NEW_PACKAGE_VERSION=$NEW_PACKAGE_VERSION" >> "$GITHUB_ENV" - - name: Updating Package Version Log + - name: Appending to package version log run: | - sed -i "s/ (BETA) | $$PACKAGE_VERSION_ID/| $PACKAGE_VERSION_ID/g" README.md + DT=$(date '+%d/%m/%Y %H:%M:%S'); + echo "| $PACKAGE_VERSION | $PACKAGE_VERSION_ID | Created on $DT |" >> README.md + REPLACEMENT="sf package install --package $PACKAGE_VERSION_I0--wait=10 --target-org YOUR_ORG_ALIAS" + sed -i 's|^sf package install.*|sf package install --package '$PACKAGE_VERSION_ID' --wait=10 --target-org $YOUR_ORG_ALIAS|' README.md + sed -i 's|^Either clone the repository.*|Either clone the repository and import the package manually, use the [Package Installation URL](https://login.salesforce.com/packaging/installPackage.apexp?p0='$PACKAGE_VERSION_ID')|' README.md + git add README.md + git commit -am "Update Package Version Log with $PACKAGE_VERSION" - name: Committing and pushing changes run: | @@ -96,4 +102,4 @@ jobs: git add README.md git commit -am "Update package version to $NEW_PACKAGE_VERSION" git tag -a "v$PACKAGE_VERSION" -m "Release Version $PACKAGE_VERSION" -m "" -m "Package Version Id: $PACKAGE_VERSION_ID" - git push --tags \ No newline at end of file + git push origin main --tags \ No newline at end of file diff --git a/README.md b/README.md index 6efb23a..09b9fde 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,17 @@ This extension package is dependent on the following packages: - [fflib-apex-mocks](https://github.com/apex-enterprise-patterns/fflib-apex-mocks) - [fflib-apex-common](https://github.com/apex-enterprise-patterns/fflib-apex-common) +## Installation + +The package is available as an Unlocked Managed Package (2GP) with package ID `0HoJ8000000KyjfKAC`. + +Either clone the repository and import the package manually, use the [Package Installation URL](https://login.salesforce.com/packaging/installPackage.apexp?p0=04tJ8000000kaKVIAY), +or execute the following SFDX CLI command in your terminal: +```bash +sf package install --package 04tJ8000000kaKVIAY --wait=10 --target-org $YOUR_ORG_ALIAS +``` +_Replace `$YOUR_ORG_ALIAS` with the alias of your target org_ + ## Extensions pack contents These features are offered in this extension package: @@ -112,5 +123,4 @@ Thank you for your donations! | Package version | Package ID | Description | |-----------------------------------------------|--------------------|--------------------------------| -| 0.1.0-2 | 04tJ8000000kaKVIAY | Created on 26/03/2026 20:07:07 | -|0.2.0-1-bugfix/pipelineBug (BETA) | 04tJ8000000kaKaIAI | Created on 30/03/2026 10:28:11 | +| 0.1.0-2 | 04tJ8000000kaKVIAY | Created on 26/03/2026 20:07:07 | \ No newline at end of file diff --git a/sfdx-project.json b/sfdx-project.json index 82d70ce..07be643 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -1,8 +1,8 @@ { "packageDirectories": [ { - "versionName": "ver 0.2", - "versionNumber": "0.2.0.NEXT", + "versionName": "ver 0.3", + "versionNumber": "0.3.0.NEXT", "path": "sfdx-source", "default": true, "package": "fflibApexExtensions", @@ -17,6 +17,7 @@ "fflibApexExtensions": "0HoJ8000000KyjfKAC", "fflibApexExtensions@0.1.0-1-feature/UnlockedManagedPackage": "04tJ8000000kaKQIAY", "fflibApexExtensions@0.1.0-2-feature/UnlockedManagedPackage": "04tJ8000000kaKVIAY", - "fflibApexExtensions@0.2.0-1-bugfix/pipelineBug": "04tJ8000000kaKaIAI" + "fflibApexExtensions@0.2.0-1-bugfix/pipelineBug": "04tJ8000000kaKaIAI", + "fflibApexExtensions@0.3.0-1-bugfix/pipelineFix2": "04tJ8000000kaKfIAI" } } \ No newline at end of file