Skip to content

Commit d86f2b1

Browse files
levylevy
committed
.github: Source shell scripts instead of calling them.
1 parent b789366 commit d86f2b1

File tree

6 files changed

+10
-51
lines changed

6 files changed

+10
-51
lines changed

‎.github/workflows/chart-tests.yml‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,7 @@ jobs:
4040
python3-scipy python3-seaborn python3-posix-ipc
4141
echo "::endgroup::"
4242
43-
echo "::group::Configuring ccache"
44-
export PATH=/usr/lib/ccache:$PATH
45-
export CCACHE_DIR=/home/runner/work/ccache
46-
echo "::endgroup::"
47-
48-
echo "::group::Running omnetpp setenv"
49-
cd $GITHUB_WORKSPACE/omnetpp
50-
cp configure.user.dist configure.user
51-
. setenv -f
52-
echo "::endgroup::"
53-
54-
echo "::group::Configuring omnetpp"
55-
./configure WITH_LIBXML=yes WITH_QTENV=no WITH_OSG=no WITH_OSGEARTH=no
56-
echo "::endgroup::"
57-
58-
echo "::group::Compiling omnetpp"
59-
make MODE=${{ matrix.mode }} -j $(nproc) base
60-
echo "::endgroup::"
43+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
6144

6245
echo "::group::Installing pip"
6346
sudo apt install -y python3-pip
@@ -67,26 +50,7 @@ jobs:
6750
python3 -m pip install matplotlib numpy pandas scipy ipython cppyy sewar dask distributed IPython optimparallel
6851
echo "::endgroup::"
6952

70-
echo "::group::Running inet setenv"
71-
cd $GITHUB_WORKSPACE/inet
72-
. setenv -f
73-
echo "::endgroup::"
74-
75-
echo "::group::Enabling all inet features"
76-
opp_featuretool enable all
77-
echo "::endgroup::"
78-
79-
echo "::group::Disabling some inet features"
80-
opp_featuretool disable VisualizationOsg VisualizationOsgShowcases SelfDoc
81-
echo "::endgroup::"
82-
83-
echo "::group::Making inet makefiles"
84-
make makefiles
85-
echo "::endgroup::"
86-
87-
echo "::group::Compiling inet"
88-
make MODE=${{ matrix.mode }} -j $(nproc)
89-
echo "::endgroup::"
53+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
9054

9155
echo "::group::Cloning inet media repository"
9256
git clone https://github.com/inet-framework/media.git

‎.github/workflows/fingerprint-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ jobs:
6262
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
6363
echo "::endgroup::"
6464
65-
$GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
65+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
6666

67-
$GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
67+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
6868

6969
echo "::group::Running fingerprint tests"
7070
SPLIT_N="${SPLIT_N:-1}"

‎.github/workflows/native-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
4242
echo "::endgroup::"
4343
44-
$GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
44+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
4545
46-
$GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
46+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh

‎.github/workflows/statistical-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
python3-scipy python3-seaborn python3-posix-ipc
4141
echo "::endgroup::"
4242
43-
$GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
43+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
4444

4545
echo "::group::Installing pip"
4646
sudo apt install -y python3-pip
@@ -50,7 +50,7 @@ jobs:
5050
python3 -m pip install matplotlib numpy pandas scipy ipython cppyy sewar dask distributed IPython optimparallel
5151
echo "::endgroup::"
5252

53-
$GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
53+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
5454

5555
echo "::group::Cloning inet statistical results"
5656
git clone https://github.com/inet-framework/statistics.git

‎.github/workflows/validation-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
python3-scipy python3-seaborn python3-posix-ipc
4343
echo "::endgroup::"
4444
45-
$GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
45+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
4646
4747
echo "::group::Installing pip"
4848
sudo apt install -y python3-pip
@@ -52,7 +52,7 @@ jobs:
5252
python3 -m pip install numpy pandas
5353
echo "::endgroup::"
5454
55-
$GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
55+
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
5656
5757
echo "::group::Running validation tests"
5858
inet_run_validation_tests -m release --exclude-filter /osg/

‎_scripts/github/build-inet.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ export PATH=/usr/lib/ccache:$PATH
1313
export CCACHE_DIR=/home/runner/work/ccache
1414
echo "::endgroup::"
1515

16-
echo "::group::Running omnetpp setenv"
17-
cd $GITHUB_WORKSPACE/omnetpp
18-
. setenv -f
19-
echo "::endgroup::"
20-
2116
echo "::group::Running inet setenv"
2217
cd $GITHUB_WORKSPACE/inet
2318
. setenv -f

0 commit comments

Comments
 (0)