Skip to content

Commit 661444c

Browse files
committed
ci: migrate checking by html5validator from TravisCI to GitHub Actions
Part of #1154
1 parent 8bef0a8 commit 661444c

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.github/workflows/static-analysis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,17 @@ jobs:
128128
run: shellcheck --version
129129
- name: Run shellcheck
130130
run: ./src/main/scripts/execute-command.sh shellcheck
131+
run-html5validator:
132+
name: Run html5validator
133+
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on
134+
runs-on: ubuntu-20.04
135+
steps:
136+
- name: Clone source code
137+
uses: actions/[email protected] # https://github.com/actions/checkout
138+
with:
139+
# Whether to configure the token or SSH key with the local git config. Default: true
140+
persist-credentials: false
141+
- name: Install html5validator
142+
run: pip3 install --user html5validator==0.4.2
143+
- name: Run html5validator
144+
run: ./src/main/scripts/execute-command.sh html5validator

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ before_script:
2525
sudo apt-get install -y python3.6 python3-pip;
2626
curl https://bootstrap.pypa.io/pip/3.6/get-pip.py | sudo -H python3.6;
2727
pip3 install --user \
28-
html5validator==0.4.2 \
2928
ansible==2.9.2 \
3029
ansible-lint==4.2.0;
3130
if [ "$TRAVIS_PULL_REQUEST" != 'false' ]; then

src/main/scripts/ci/check-build-and-verify.sh

+2-15
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ if [ "${1:-}" = '--only-integration-tests' ]; then
5858
RUN_ONLY_INTEGRATION_TESTS=yes
5959
fi
6060

61-
HTML_STATUS=
6261
ENFORCER_STATUS=
6362
TEST_STATUS=
6463
CODENARC_STATUS=
@@ -71,7 +70,6 @@ if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' ] && [ "${TRAVIS_PULL_REQUEST:-fal
7170
DANGER_STATUS=
7271
fi
7372

74-
HTML_TIME=0
7573
ENFORCER_TIME=0
7674
TEST_TIME=0
7775
CODENARC_TIME=0
@@ -101,7 +99,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
10199
AFFECTS_POM_XML="$(echo "$MODIFIED_FILES" | grep -Fxq 'pom.xml' || echo 'no')"
102100
AFFECTS_TRAVIS_CFG="$(echo "$MODIFIED_FILES" | grep -Fxq '.travis.yml' || echo 'no')"
103101
AFFECTS_SPOTBUGS_CFG="$(echo "$MODIFIED_FILES" | grep -q 'spotbugs-filter\.xml$' || echo 'no')"
104-
AFFECTS_HTML_FILES="$(echo "$MODIFIED_FILES" | grep -q '\.html$' || echo 'no')"
105102
AFFECTS_JAVA_FILES="$(echo "$MODIFIED_FILES" | grep -q '\.java$' || echo 'no')"
106103
AFFECTS_GROOVY_FILES="$(echo "$MODIFIED_FILES" | grep -q '\.groovy$' || echo 'no')"
107104
AFFECTS_PLAYBOOKS="$(echo "$MODIFIED_FILES" | grep -Eq '(vagrant|prod|deploy|bootstrap|/roles/.+)\.yml$' || echo 'no')"
@@ -121,9 +118,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
121118
fi
122119

123120
if [ "$AFFECTS_TRAVIS_CFG" = 'no' ]; then
124-
if [ "$AFFECTS_HTML_FILES" = 'no' ]; then
125-
HTML_STATUS=skip
126-
fi
127121
if [ "$AFFECTS_PLAYBOOKS" = 'no' ]; then
128122
ANSIBLE_LINT_STATUS=skip
129123
fi
@@ -141,12 +135,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
141135

142136
echo
143137

144-
if [ "$HTML_STATUS" != 'skip' ]; then
145-
"$EXEC_CMD" html5validator >validator.log 2>&1 || HTML_STATUS=fail
146-
HTML_TIME=$((SECONDS - START_TIME))
147-
fi
148-
print_status "$HTML_STATUS" "$HTML_TIME" 'Run html5validator'
149-
150138
if [ "$ENFORCER_STATUS" != 'skip' ]; then
151139
START_TIME=$SECONDS
152140
"$EXEC_CMD" enforcer >enforcer.log 2>&1 || ENFORCER_STATUS=fail
@@ -200,7 +188,6 @@ fi
200188
print_status "$DANGER_STATUS" "$DANGER_TIME" 'Run danger'
201189

202190
if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
203-
[ "$HTML_STATUS" = 'skip' ] || print_log validator.log 'Run html5validator'
204191
[ "$ENFORCER_STATUS" = 'skip' ] || print_log enforcer.log 'Run maven-enforcer-plugin'
205192
[ "$TEST_STATUS" = 'skip' ] || print_log test.log 'Run unit tests'
206193
[ "$CODENARC_STATUS" = 'skip' ] || print_log codenarc.log 'Run CodeNarc'
@@ -214,8 +201,8 @@ if [ "$DANGER_STATUS" != 'skip' ]; then
214201
print_log danger.log 'Run danger'
215202
fi
216203

217-
rm -f validator.log enforcer.log test.log codenarc.log spotbugs.log verify.log danger.log ansible_lint.log
204+
rm -f enforcer.log test.log codenarc.log spotbugs.log verify.log danger.log ansible_lint.log
218205

219-
if echo "$HTML_STATUS$ENFORCER_STATUS$TEST_STATUS$CODENARC_STATUS$SPOTBUGS_STATUS$VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS" | grep -Fqs 'fail'; then
206+
if echo "$ENFORCER_STATUS$TEST_STATUS$CODENARC_STATUS$SPOTBUGS_STATUS$VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS" | grep -Fqs 'fail'; then
220207
exit 1
221208
fi

0 commit comments

Comments
 (0)