Skip to content

Commit db97c0f

Browse files
committed
CircleCI: Switch jobs from Docker container to full VM
Which hopefully fixes the ASLR issue for the sanitizer lit-tests.
1 parent 8d03ed0 commit db97c0f

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

.circleci/config.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ commonSteps: &commonSteps
99
if [ "$CI_OS" = "linux" ]; then
1010
export DEBIAN_FRONTEND=noninteractive
1111
if [[ "${EXTRA_CMAKE_FLAGS:-}" = *-DMULTILIB?ON* ]]; then
12-
dpkg --add-architecture i386
12+
sudo dpkg --add-architecture i386
1313
gcc_pkg="g++-multilib"
1414
libcurl_pkg="libcurl4t64 libcurl4t64:i386"
1515
else
1616
gcc_pkg="g++"
1717
libcurl_pkg="libcurl4t64"
1818
fi
19-
apt-get -q update
20-
apt-get -yq install \
19+
sudo apt-get -q update
20+
sudo apt-get -yq install \
2121
git-core $gcc_pkg cmake \
2222
llvm-$LLVM_MAJOR-dev libclang-common-$LLVM_MAJOR-dev zlib1g-dev \
2323
$libcurl_pkg curl gdb python3 python3-pip tzdata unzip zip \
@@ -28,11 +28,11 @@ commonSteps: &commonSteps
2828
unzip ninja-linux.zip -d ninja
2929
rm ninja-linux.zip
3030
# Add Ninja to PATH for future steps
31-
echo "export PATH=$PWD/ninja:$PATH" >> $BASH_ENV
31+
echo "export PATH=$PWD/ninja:\$PATH" >> $BASH_ENV
3232
fi
3333
# Install lit
3434
python3 --version
35-
python3 -m pip install --break-system-packages lit
35+
python3 -m pip install --user lit
3636
python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
3737
# Download & extract host LDC if HOST_LDC_VERSION is set
3838
if [[ -v HOST_LDC_VERSION ]]; then
@@ -79,13 +79,7 @@ commonSteps: &commonSteps
7979
- run:
8080
name: Run DMD testsuite
8181
when: always
82-
command: |
83-
cd ../build
84-
if [ "$CI_OS" = "linux" ]; then
85-
# Circle's RAM disk FS apparently doesn't allow long paths.
86-
rm ../project/tests/dmd/compilable/issue17167.sh
87-
fi
88-
DMD_TESTSUITE_MAKE_ARGS=-j$PARALLELISM ctest -V -R dmd-testsuite
82+
command: cd ../build && DMD_TESTSUITE_MAKE_ARGS=-j$PARALLELISM ctest -V -R dmd-testsuite
8983
- run:
9084
name: Run defaultlib unittests & druntime integration tests
9185
when: always
@@ -95,8 +89,8 @@ version: 2
9589
jobs:
9690
Ubuntu-24.04-multilib-rtSanitizers:
9791
<<: *commonSteps
98-
docker:
99-
- image: ubuntu:24.04
92+
machine:
93+
image: ubuntu-2404:current
10094
resource_class: large
10195
environment:
10296
- PARALLELISM: 4
@@ -106,8 +100,8 @@ jobs:
106100
- EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DRT_SUPPORT_SANITIZERS=ON -DBUILD_LTO_LIBS=ON"
107101
Ubuntu-24.04-sharedLibsOnly-gdmd:
108102
<<: *commonSteps
109-
docker:
110-
- image: ubuntu:24.04
103+
machine:
104+
image: ubuntu-2404:current
111105
resource_class: large
112106
environment:
113107
- PARALLELISM: 4

0 commit comments

Comments
 (0)