From b4e00eb06dbebe0517495f931d5276018f85c551 Mon Sep 17 00:00:00 2001 From: Colack Date: Mon, 18 Nov 2024 07:50:49 -0800 Subject: [PATCH] Update update-submodules.yml --- .github/workflows/update-submodules.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index 5a77fbe8..6155a356 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -8,16 +8,18 @@ jobs: runs-on: ubuntu-latest steps: + # Checkout the repository including submodules - name: Checkout repository with submodules uses: actions/checkout@v3 with: submodules: recursive - - name: Pull latest changes for submodules (merge) + # Pull the latest changes for each submodule using merge strategy and allow unrelated histories + - name: Pull latest changes for submodules (merge, allow unrelated histories) run: | - git submodule foreach 'git fetch && git pull origin $(git rev-parse --abbrev-ref HEAD) --no-rebase' - + git submodule foreach 'git fetch && git pull origin $(git rev-parse --abbrev-ref HEAD) --no-rebase --allow-unrelated-histories' + # Commit and push changes if any submodules were updated - name: Commit and push changes run: | if [ -n "$(git status --porcelain)" ]; then @@ -28,4 +30,3 @@ jobs: git push origin HEAD else echo "No changes in submodules to commit." - fi