Merge pull request #82 from FullStackWithLawrence/next

chore: use git merge --allow-unrelated-histories main
FullStackWithLawrence · Nov 17, 2023 · 9e47cad · 9e47cad
2 parents 3ed978a + b2679e9
commit 9e47cad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/pushMain.yml b/.github/workflows/pushMain.yml
@@ -32,7 +32,7 @@ jobs:
           git checkout main
           git pull
           git checkout next
-          git merge main
+          git merge --allow-unrelated-histories main
           git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:next
 
       - name: Merge main into next-major
@@ -44,7 +44,7 @@ jobs:
           git checkout main
           git pull
           git checkout next-major
-          git merge main
+          git merge --allow-unrelated-histories main
           git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:next-major
 
       - name: Merge main into alpha
@@ -56,7 +56,7 @@ jobs:
           git checkout main
           git pull
           git checkout alpha
-          git merge main
+          git merge --allow-unrelated-histories main
           git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:alpha
 
       - name: Merge main into beta
@@ -68,7 +68,7 @@ jobs:
           git checkout main
           git pull
           git checkout beta
-          git merge main
+          git merge --allow-unrelated-histories main
           git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:beta
 
   semantic-release:

diff --git a/.github/workflows/semanticVersionBump.yml b/.github/workflows/semanticVersionBump.yml
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 # Lawrence McDaniel - https://lawrencemcdaniel.com
-# Version Bump Workflow
+# Version Bump Workflow for Python package openai_utils
 #
 # Calculate the version of the 'next' branch based on semantic-release rules.
 # Compares the existing value of __version__.py to the calculated value.
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       VERSION_FILE: __version__.py
-      VERSION_FILE_PATH: ${{ github.workspace }}/api/terraform/python/layer_genai/openai_utils/
+      PACKAGE_PATH: ${{ github.workspace }}/api/terraform/python/layer_genai/openai_utils/
 
     steps:
       - uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
         # the current version persisted to __version__.py
         id: current_version
         run: |
-          cd ${{ env.VERSION_FILE_PATH }}
+          cd ${{ env.PACKAGE_PATH }}
           echo "CURRENT_VERSION=$(python -c 'from __version__ import __version__; print(__version__)')" >> $GITHUB_ENV
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
@@ -106,7 +106,7 @@ jobs:
           git commit -m "chore: [gh] Update __version__.py to ${{ env.NEXT_VERSION }} [skip ci]"
           git push https://${{ secrets.PAT }}@github.com/${{ github.repository }}.git HEAD:${{ github.ref }}
         env:
-          VERSION_FILE: ${{ env.VERSION_FILE_PATH }}${{ env.VERSION_FILE }}
+          VERSION_FILE: ${{ env.PACKAGE_PATH }}${{ env.VERSION_FILE }}
           GITHUB_TOKEN: ${{ secrets.PAT }}
           NEXT_VERSION: ${{ env.NEXT_VERSION }}
           VERSION_CHANGED: ${{ env.VERSION_CHANGED }}