From 51e8ff27c9d026a38bf7c0ef45a445b948bae15e Mon Sep 17 00:00:00 2001
From: Jonathan Gillespie <jonathan.c.gillespie@gmail.com>
Date: Thu, 19 Dec 2024 16:56:10 -0500
Subject: [PATCH] [WIP] Fixed a few more small issues in build.yml

---
 .github/workflows/build.yml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 58e334857..c5094bd71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -726,18 +726,15 @@ jobs:
       # .....
       # ...
 
-      # TODO Add some extra steps to try to deploy to the scratch org, using the manifest file, to ensure it works
-      - name: 'Generate core package metadata manifest file'
-        run: |
-          npm run package:manifest:generate:core
-          git add ./nebula-logger/core.package.xml
-          git commit -m "Generated updated package.xml manifest file for core unlocked package version"
-
-      - name: 'Commit New Package Version'
+      - name: 'Configure git for pipeline commits'
         if: ${{ github.event_name == 'pull_request' }}
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action Bot"
+
+      - name: 'Commit new package version'
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
           # npm run sf:plugins:link:bummer
           echo y | npx sf plugins install @jongpie/sfdx-bummer-plugin --force
           npx sf bummer:package:aliases:sort
@@ -746,6 +743,18 @@ jobs:
           git commit -m "Created new core unlocked package version"
           git push
 
+      # TODO Add some extra steps to try to deploy to the scratch org, using the manifest file, to ensure it works
+      - name: 'Commit updates to core package manifest file'
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          npm run package:manifest:generate:core || true
+          git add ./nebula-logger/core.package.xml || true
+          git commit -m "Generated updated package.xml manifest file for core unlocked package version" || true
+
+      - name: 'Push pipeline commits'
+        if: ${{ github.event_name == 'pull_request' }}
+        run: git push
+
   promote-package-versions:
     if: ${{ github.ref == 'refs/heads/main' }}