Skip to content

Commit 1e3cdb0

Browse files
Merge pull request #280 from jembi/CU-86bzn78dn_Build-issue-in-the-Main-branch
CU-86bzn78dn - Build issue in the Main branch
2 parents 06ba590 + bc5855e commit 1e3cdb0

File tree

3 files changed

+32
-18
lines changed

3 files changed

+32
-18
lines changed

JeMPI_Apps/build-all-ci.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -e
44
set -u
55

6+
CI="${CI:-true}"
67
if [ $# -eq 0 ]; then
78
tag_to_use="ci-test-main"
89
else
@@ -25,29 +26,29 @@ popd
2526
docker buildx create --name container --driver=docker-container
2627

2728
pushd JeMPI_AsyncReceiver
28-
CI=true TAG=$tag_to_use ./build.sh || exit 1
29+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
2930
popd
3031
pushd JeMPI_ETL
31-
CI=true TAG=$tag_to_use ./build.sh || exit 1
32+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
3233
popd
3334
pushd JeMPI_Controller
34-
CI=true TAG=$tag_to_use ./build.sh || exit 1
35+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
3536
popd
3637
pushd JeMPI_EM_Scala
37-
CI=true TAG=$tag_to_use ./build.sh || exit 1
38+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
3839
popd
3940
pushd JeMPI_Linker
40-
CI=true TAG=$tag_to_use ./build.sh || exit 1
41+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
4142
popd
4243
pushd JeMPI_API
43-
CI=true TAG=$tag_to_use ./build.sh || exit 1
44+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
4445
popd
4546
pushd JeMPI_API_KC
46-
CI=true TAG=$tag_to_use ./build.sh || exit 1
47+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
4748
popd
4849
pushd JeMPI_Bootstrapper
49-
CI=true TAG=$tag_to_use ./build.sh || exit 1
50+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
5051
popd
5152
pushd JeMPI_UI
52-
CI=true TAG=$tag_to_use ./build-image.sh || exit 1
53+
CI=$CI TAG=$tag_to_use ./build-image.sh || exit 1
5354
popd

JeMPI_Apps/build-all-java.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,40 @@ set -u
66
cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API/src/main/resources/config-api.json
77
cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API_KC/src/main/resources/config-api.json
88

9+
CI="${CI:-false}"
10+
if [ $# -eq 0 ]; then
11+
tag_to_use="ci-test-main"
12+
else
13+
tag_to_use=$1
14+
fi
915
mvn clean package
1016
pushd JeMPI_EM_Scala
1117
sbt clean assembly
1218
popd
1319

1420
pushd JeMPI_AsyncReceiver
15-
./build.sh || exit 1
21+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
1622
popd
1723
pushd JeMPI_ETL
18-
./build.sh || exit 1
24+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
1925
popd
2026
pushd JeMPI_Controller
21-
./build.sh || exit 1
27+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
2228
popd
2329
pushd JeMPI_EM_Scala
24-
./build.sh || exit 1
30+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
2531
popd
2632
pushd JeMPI_Linker
27-
./build.sh || exit 1
33+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
2834
popd
2935
pushd JeMPI_API
30-
./build.sh || exit 1
36+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
3137
popd
3238
pushd JeMPI_API_KC
33-
./build.sh || exit 1
39+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
3440
popd
3541
pushd JeMPI_Bootstrapper
36-
./build.sh || exit 1
42+
CI=$CI TAG=$tag_to_use ./build.sh || exit 1
3743
popd
3844
pushd JeMPI_AsyncReceiver
3945
./push.sh

JeMPI_Apps/build-all-ui.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
set -e
44
set -u
55

6+
CI="${CI:-false}"
7+
if [ $# -eq 0 ]; then
8+
tag_to_use="ci-test-main"
9+
else
10+
tag_to_use=$1
11+
fi
12+
613
pushd JeMPI_UI
7-
./build-image.sh || exit 1
14+
CI=$CI TAG=$tag_to_use ./build-image.sh || exit 1
815
popd
916

1017
pushd JeMPI_UI

0 commit comments

Comments
 (0)