aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/docker.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0475d0a..0a51dc2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,7 +18,7 @@ jobs:
18 - 18 -
19 name: Checkout 19 name: Checkout
20 uses: actions/checkout@v3 20 uses: actions/checkout@v3
21 - 21 -
22 name: Check whether there are any commits since this run was last triggered and push them and/or set the output 22 name: Check whether there are any commits since this run was last triggered and push them and/or set the output
23 id: should_run 23 id: should_run
24 run: | 24 run: |
@@ -33,9 +33,9 @@ jobs:
33 git push origin main --no-verify 33 git push origin main --no-verify
34 git checkout - 34 git checkout -
35 35
36 git submodule update --init --recursive --remote --rebase --force 36 git rebase main
37 37
38 CHANGES_COUNT=$(git diff --shortstat origin/main | wc -l) 38 CHANGES_COUNT=$(git log @{u}.. | wc -l)
39 MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" 39 MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}"
40 VERSION_BUMP="${{ contains(github.event.inputs.message, '[version bump]') }}" 40 VERSION_BUMP="${{ contains(github.event.inputs.message, '[version bump]') }}"
41 if [ $CHANGES_COUNT -gt 0 ] || [[ $MANUAL_REBUILD == "true" && $VERSION_BUMP == "true" ]]; then 41 if [ $CHANGES_COUNT -gt 0 ] || [[ $MANUAL_REBUILD == "true" && $VERSION_BUMP == "true" ]]; then