Skip to content

Commit 43543d9

Browse files
authored
Merge pull request #4345 from apostasie/2025-06-fix-tigron-lint
Re-enable tigron lint on the CI & makefile copy-pasta fix
2 parents 35eea81 + 787bba6 commit 43543d9

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.github/workflows/workflow-tigron.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,20 @@ jobs:
5858
brew install yamllint shellcheck
5959
fi
6060
echo "::endgroup::"
61-
- if: ${{ env.GO_VERSION != '' && env.RUNNER_OS == 'Linux' && matrix.goos == '' }}
61+
- if: ${{ env.GO_VERSION != '' && matrix.goos == '' }}
6262
name: "lint"
6363
env:
6464
NO_COLOR: true
6565
run: |
66-
echo "::group:: lint"
67-
cd mod/tigron
68-
export LINT_COMMIT_RANGE="$(jq -r '.after + "..HEAD"' ${GITHUB_EVENT_PATH})"
69-
make lint
70-
echo "::endgroup::"
66+
if [ "$RUNNER_OS" == Linux ]; then
67+
echo "::group:: lint"
68+
cd mod/tigron
69+
export LINT_COMMIT_RANGE="$(jq -r '.after + "..HEAD"' ${GITHUB_EVENT_PATH})"
70+
make lint
71+
echo "::endgroup::"
72+
else
73+
echo "Lint is disabled on $RUNNER_OS"
74+
fi
7175
- if: ${{ env.GO_VERSION != '' }}
7276
name: "test-unit"
7377
run: |

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ lint-licenses-all:
182182
&& GOOS=linux make lint-licenses \
183183
&& GOOS=windows make lint-licenses \
184184
&& GOOS=freebsd make lint-licenses \
185-
&& GOOS=darwin make lint-go
185+
&& GOOS=darwin make lint-licenses
186186
$(call footer, $@)
187187

188188
##########################
@@ -200,7 +200,7 @@ fix-go-all:
200200
&& GOOS=linux make fix-go \
201201
&& GOOS=windows make fix-go \
202202
&& GOOS=freebsd make fix-go \
203-
&& GOOS=darwin make lint-go
203+
&& GOOS=darwin make fix-go
204204
$(call footer, $@)
205205

206206
fix-mod:

0 commit comments

Comments
 (0)