Skip to content

Commit 100f67f

Browse files
authored
Update maven (the-benchmarker#610)
* exit unmodified builds * Update maven from 3.5.4 to 3.6 * use a more expressive image tag
1 parent aa3fec4 commit 100f67f

2 files changed

Lines changed: 44 additions & 1 deletion

File tree

.ci/preflight.sh

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/bash
2+
3+
travis_terminate() {
4+
if [[ ! "${TRAVIS_OS_NAME}" ]]; then
5+
return
6+
fi
7+
8+
"_travis_terminate_${TRAVIS_OS_NAME}" "${@}"
9+
}
10+
11+
_travis_terminate_linux() {
12+
_travis_terminate_unix "${@}"
13+
}
14+
15+
_travis_terminate_osx() {
16+
_travis_terminate_unix "${@}"
17+
}
18+
19+
_travis_terminate_unix() {
20+
set +e
21+
[[ "${TRAVIS_FILTERED}" == redirect_io && -e /dev/fd/9 ]] &&
22+
sync &&
23+
command exec 1>&9 2>&9 9>&- &&
24+
sync
25+
pgrep -u "${USER}" | grep -v -w "${$}" >"${TRAVIS_TMPDIR}/pids_after"
26+
awk 'NR==FNR{a[$1]++;next};!($1 in a)' "${TRAVIS_TMPDIR}"/pids_{before,after} |
27+
xargs kill &>/dev/null || true
28+
pkill -9 -P "${$}" &>/dev/null || true
29+
exit "${1}"
30+
}
31+
32+
33+
# List updated frameworks
34+
git diff --name-only master...${TRAVIS_COMMIT} | awk -F '/' '{print $2}' | sort | uniq | sed '/^$/d' > /tmp/changed
35+
36+
# If current framework was updated
37+
grep -q "^$FRAMEWORK$" /tmp/changed
38+
39+
if [[ $? != 0 ]]; then
40+
echo "$FRAMEWORK was not modified, exiting."
41+
exit 1
42+
fi
43+

java/act/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.5.4
1+
FROM maven:3.6-jdk-8
22

33
WORKDIR /usr/src/app
44

0 commit comments

Comments
 (0)