File tree 8 files changed +22
-10
lines changed
8 files changed +22
-10
lines changed Original file line number Diff line number Diff line change 1
- #! /bin/sh
1
+ #! /bin/bash
2
2
3
3
. .github/jobs/ci_settings.sh
4
4
@@ -13,7 +13,7 @@ export APP_ENV="${4:-prod}"
13
13
14
14
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:- root}
15
15
16
- set -eux
16
+ set -euxo pipefail
17
17
18
18
if [ -z " $phpversion " ]; then
19
19
phpversion=$( php -r ' echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";' )
Original file line number Diff line number Diff line change 3
3
. .github/jobs/ci_settings.sh
4
4
5
5
if [ -n " $1 " ] && [ " $1 " != " default" ]; then
6
- export ARCH=" $1 "
6
+ export ARCH_OPTION=" -a $1 "
7
+ else
8
+ export ARCH_OPTION=" "
7
9
fi
8
10
9
11
function finish() {
@@ -20,6 +22,8 @@ FAILED=0
20
22
21
23
trap finish EXIT
22
24
25
+ set -euo pipefail
26
+
23
27
DIR=$PWD
24
28
section_start " Debug info"
25
29
lsb_release -a | tee -a " $ARTIFACTS /debug-info"
@@ -44,7 +48,7 @@ cd /opt/domjudge/judgehost/bin || exit 1
44
48
section_end chroot
45
49
46
50
section_start " Show minimal chroot"
47
- ./dj_make_chroot -a " $ARCH " | tee -a " $ARTIFACTS " /chroot.log
51
+ ./dj_make_chroot $ARCH_OPTION | tee -a " $ARTIFACTS " /chroot.log
48
52
section_end
49
53
50
54
section_start " Test chroot contents"
Original file line number Diff line number Diff line change 1
- #! /bin/sh
1
+ #! /bin/bash
2
2
3
- set -eux
3
+ set -euxo pipefail
4
4
5
5
. .github/jobs/ci_settings.sh
6
6
Original file line number Diff line number Diff line change 1
- #! /bin/sh
1
+ #! /bin/bash
2
2
3
- set -eux
3
+ set -euxo pipefail
4
4
5
5
distro_id=$( grep " ^ID=" /etc/os-release)
6
6
Original file line number Diff line number Diff line change 1
1
#! /bin/sh
2
2
3
+ # We can't convert this script to bash as GHA doesn't have bash installed
4
+ #
5
+ # The current script doesn't use a piped command so the "benefit" of using
6
+ # pipefail is not there over the hassle of maintaining another container.
3
7
set -eux
4
8
5
9
echo " Set plugin config for version detection"
Original file line number Diff line number Diff line change 1
- #! /bin/sh
1
+ #! /bin/bash
2
2
3
- set -eux
3
+ set -euxo pipefail
4
4
5
5
# Ignore the CLICS API strict mode
6
6
sudo sed -i " s/'strict'/'ignore-clics'/g" /opt/domjudge/domserver/webapp/src/Controller/API/AbstractRestController.php
Original file line number Diff line number Diff line change 2
2
3
3
. .github/jobs/ci_settings.sh
4
4
5
+ set -euo pipefail
6
+
5
7
DIR=" $PWD "
6
8
7
9
export version=$1
Original file line number Diff line number Diff line change 2
2
3
3
. .github/jobs/ci_settings.sh
4
4
5
+ set -euo pipefail
6
+
5
7
DIR=" $PWD "
6
8
7
9
if [ " $# " -ne " 2" ]; then
You can’t perform that action at this time.
0 commit comments