Skip to content

Commit b789366

Browse files
levylevy
committed
.github: Added ccache and stuff.
1 parent 4d2dcaf commit b789366

File tree

6 files changed

+11
-83
lines changed

6 files changed

+11
-83
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: |
3535
echo "::group::Installing packages"
3636
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
37-
make clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
37+
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
3838
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
3939
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4040
python3-scipy python3-seaborn python3-posix-ipc

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

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -58,49 +58,13 @@ jobs:
5858
run: |
5959
echo "::group::Installing packages"
6060
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
61-
make clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
61+
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
6262
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
6363
echo "::endgroup::"
6464
65-
echo "::group::Configuring ccache"
66-
export PATH=/usr/lib/ccache:$PATH
67-
export CCACHE_DIR=/home/runner/work/ccache
68-
echo "::endgroup::"
69-
70-
echo "::group::Running omnetpp setenv"
71-
cd $GITHUB_WORKSPACE/omnetpp
72-
cp configure.user.dist configure.user
73-
. setenv -f
74-
echo "::endgroup::"
75-
76-
echo "::group::Configuring omnetpp"
77-
./configure WITH_LIBXML=yes WITH_QTENV=no WITH_OSG=no WITH_OSGEARTH=no
78-
echo "::endgroup::"
79-
80-
echo "::group::Compiling omnetpp"
81-
make MODE=${{ matrix.mode }} -j $(nproc) base
82-
echo "::endgroup::"
83-
84-
echo "::group::Running inet setenv"
85-
cd $GITHUB_WORKSPACE/inet
86-
. setenv -f
87-
echo "::endgroup::"
88-
89-
echo "::group::Enabling all inet features"
90-
opp_featuretool enable all
91-
echo "::endgroup::"
92-
93-
echo "::group::Disabling some inet features"
94-
opp_featuretool disable VisualizationOsg VisualizationOsgShowcases SelfDoc
95-
echo "::endgroup::"
96-
97-
echo "::group::Making inet makefiles"
98-
make makefiles
99-
echo "::endgroup::"
65+
$GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
10066

101-
echo "::group::Compiling inet"
102-
make MODE=${{ matrix.mode }} -j $(nproc)
103-
echo "::endgroup::"
67+
$GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
10468

10569
echo "::group::Running fingerprint tests"
10670
SPLIT_N="${SPLIT_N:-1}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
key: native-${{ matrix.mode }}-ccache-${{ github.run_id }}
3232
# See: https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
3333
restore-keys: native-${{ matrix.mode }}-ccache
34-
- name: Building
34+
- name: Build
3535
env:
3636
MODE: ${{ matrix.mode }}
3737
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
echo "::group::Installing packages"
5151
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
52-
make clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
52+
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
5353
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
5454
echo "::endgroup::"
5555

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

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,13 @@ jobs:
3434
run: |
3535
echo "::group::Installing packages"
3636
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
37-
make clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
37+
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
3838
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
3939
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
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+
$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+
$GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
9054

9155
echo "::group::Cloning inet statistical results"
9256
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
@@ -30,13 +30,13 @@ jobs:
3030
key: native-${{ matrix.mode }}-ccache-${{ github.run_id }}
3131
# See: https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
3232
restore-keys: native-${{ matrix.mode }}-ccache
33-
- name: Building and testing
33+
- name: Build and test
3434
env:
3535
MODE: ${{ matrix.mode }}
3636
run: |
3737
echo "::group::Installing packages"
3838
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
39-
make clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
39+
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
4040
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
4141
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4242
python3-scipy python3-seaborn python3-posix-ipc

0 commit comments

Comments
 (0)