Skip to content

Commit 86461bf

Browse files
author
Samat Gaynutdinov
committed
refactor: don't start another container in job
1 parent d8864b8 commit 86461bf

File tree

3 files changed

+43
-16
lines changed

3 files changed

+43
-16
lines changed

.github/workflows/build-utbot.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133

134134
build-portable-container:
135135
needs: build-utbot-and-generate-test
136-
runs-on: ubuntu-latest
136+
runs-on: ubuntu-18.04
137137
env:
138138
DOCKER_IMAGE_TAG: docker-image
139139
PORTABLE_CONTAINER_NAME: Portable
@@ -143,12 +143,10 @@ jobs:
143143
with:
144144
submodules: recursive
145145

146-
- uses: satackey/[email protected]
147-
continue-on-error: false
148-
149-
- name: Build Portable docker image
146+
- name: Install dependencies
150147
run: |
151-
docker build --tag $DOCKER_IMAGE_TAG . --file docker/Dockerfile_image_for_portability_test
148+
chmod +x docker/action-scripts/install-portability-image-dependencies.sh
149+
./docker/action-scripts/install-portability-image-dependencies.sh
152150
153151
- name: Download generated test
154152
uses: actions/download-artifact@v3

docker/action-scripts/check-portable-tests.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ set -e
55

66
# Identify the directory where the current script is located
77
CURRENT_FOLDER="$( cd $( dirname ${BASH_SOURCE[0]} ) && pwd )"
8-
PROJECT_DIR=$CURRENT_FOLDER/../..
98

10-
# run Portable container
11-
docker run -d --name $PORTABLE_CONTAINER_NAME $DOCKER_IMAGE_TAG
9+
# directory with generated tests
10+
PROJECT_DIR=$CURRENT_FOLDER/../../integration-tests/c-example
1211

13-
# Copy tests inside Portable container
14-
docker cp "$PROJECT_DIR/integration-tests/c-example/" $PORTABLE_CONTAINER_NAME:/home/c-example
15-
16-
# Jump to container and check portability
17-
REMOVE_CMD="rm -r /home/c-example/build/utbot_build"
18-
RUN_TEST_CMD="env make -f /home/c-example/tests/lib/floats/floating_point_plain.mk run GTEST_FLAGS=\"--gtest_filter=*.plain_isnan_test_1\" CLANG=\"/usr/bin/clang-10\" CLANGXX=\"/usr/bin/clang++-10\" GTEST=\"/gtest\""
19-
docker exec $PORTABLE_CONTAINER_NAME /bin/sh -c "$REMOVE_CMD && $RUN_TEST_CMD"
12+
# Run tests
13+
REMOVE_CMD=$(rm -r $PROJECT_DIR/build/utbot_build)
14+
RUN_TEST_CMD=$(env make -f $PROJECT_DIR/tests/lib/floats/floating_point_plain.mk run GTEST_FLAGS="--gtest_filter=*.plain_isnan_test_1" CLANG="/usr/bin/clang-10" CLANGXX="/usr/bin/clang++-10" GTEST="/gtest")
15+
$REMOVE_CMD && $RUN_TEST_CMD
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/bin/bash
2+
3+
#for fail-fast execution mode
4+
set -e
5+
6+
sudo apt update && apt install -y build-essential cmake
7+
8+
# install clang
9+
sudo apt update && apt -y install clang-10
10+
11+
# install wget for CMake
12+
# sudo apt update && apt -y install wget
13+
14+
15+
#install git for gtest
16+
sudo apt install -y software-properties-common
17+
sudo apt update
18+
sudo add-apt-repository -y ppa:git-core/ppa
19+
sudo apt update
20+
sudo apt install -y git libcurl4-openssl-dev
21+
22+
ENV INSTALL_DIR=/install
23+
ENV UTBOT_CMAKE_BINARY=cmake
24+
25+
git config --global http.sslVerify "false"
26+
27+
#install gtest
28+
29+
sudo git clone --single-branch -b release-1.10.0 https://github.com/google/googletest.git /gtest
30+
cd /gtest && mkdir build && cd build && \
31+
$UTBOT_CMAKE_BINARY -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR .. && \
32+
$UTBOT_CMAKE_BINARY --build . --target install && \
33+
cd /

0 commit comments

Comments
 (0)