From 03aec8c802f8817a13930f2a1e33106a2e4674a1 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 30 Apr 2022 23:30:50 -0500 Subject: Pull new version of 'recipes' [skip ci] Defensive programming for updating 'recipes' during nightly builds --- .github/workflows/builds.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to '.github/workflows/builds.yml') diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 3645f86da..9bf59a8a9 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -59,14 +59,15 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com - # TODO: Need to check if this is required, keeping for future reference (can be removed if the submodule-update issue is resolved with other changes in this commit) # Defensive: update submodules in the develop branch - # git checkout develop - # git submodule update --init --recursive --remote --rebase --force - # git add . - # git commit -am "Update submodules [skip ci]" --no-verify || true - # git push origin develop --no-verify - # git checkout - + git checkout develop + git submodule update --init --recursive --remote --rebase --force + git add . + git commit -am "Update submodules [skip ci]" --no-verify || true + git push origin develop --no-verify + git checkout - + + git submodule update --init --recursive --remote --rebase --force CHANGES_COUNT=$(git diff --shortstat origin/develop | wc -l) MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" -- cgit v1.2.3-54-g00ecf