Skip to content

Commit 7295643

Browse files
committed
Merge branch 'fix-static-dependencies' into 'main'
Skip configuring gtirb tests for static builds See merge request rewriting/ddisasm!1253
2 parents 960750f + cd96ce0 commit 7295643

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.ci/gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ build-static:
545545
- git clone https://git.grammatech.com/rewriting/gtirb.git -b $GTIRB_BRANCH
546546
- mkdir gtirb/build
547547
- cd gtirb/build
548-
- cmake ../ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGTIRB_BUILD_SHARED_LIBS=OFF
548+
- cmake ../ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGTIRB_BUILD_SHARED_LIBS=OFF -DGTIRB_ENABLE_TESTS=OFF
549549
- make
550550
- cd python; python3 -m pip install .; cd ..
551551
- cd ../..
@@ -631,7 +631,7 @@ static-drivers:
631631
- git clone https://git.grammatech.com/rewriting/gtirb.git -b $GTIRB_BRANCH
632632
- cd gtirb
633633
- mkdir build && cd build
634-
- cmake ../ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DGTIRB_BUILD_SHARED_LIBS=OFF
634+
- cmake ../ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DGTIRB_BUILD_SHARED_LIBS=OFF -DGTIRB_ENABLE_TESTS=OFF
635635
- make
636636
- cd python; python3 -m pip install .; cd ..
637637
- cd ../..

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN apt-get -y update \
105105
ARG GTIRB_BRANCH=master
106106
ARG GTIRB_CACHE_KEY
107107
RUN git clone --depth=1 -b $GTIRB_BRANCH https://github.com/GrammaTech/gtirb /usr/local/src/gtirb
108-
RUN cmake -DGTIRB_JAVA_API=OFF -DGTIRB_CL_API=OFF /usr/local/src/gtirb -B/usr/local/src/gtirb/build
108+
RUN cmake -DGTIRB_JAVA_API=OFF -DGTIRB_CL_API=OFF -DGTIRB_ENABLE_TESTS=OFF /usr/local/src/gtirb -B/usr/local/src/gtirb/build
109109
RUN cmake --build /usr/local/src/gtirb/build -j4 --target all install
110110

111111
# ------------------------------------------------------------------------------

0 commit comments

Comments
 (0)