Skip to content

Commit f269912

Browse files
committed
remove recent workdir addition
1 parent 5808c3c commit f269912

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

docker/Dockerfile

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUN /opt/install-deps.sh
1313
FROM base AS build_and_test
1414

1515
COPY . src
16-
WORKDIR src
1716

1817
ARG CC
1918
ARG CXX
@@ -22,62 +21,59 @@ ARG GIT_COMMIT_HASH
2221

2322
ENV GIT_COMMIT_HASH=$GIT_COMMIT_HASH
2423

25-
RUN CC=${CC:?} CXX=${CXX:?} CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:?} CFLAGS="-march=haswell" CXXFLAGS="-march=haswell" ASMFLAGS="-march=haswell" ./scripts/configure.sh
24+
RUN cd src && CC=${CC:?} CXX=${CXX:?} CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:?} CFLAGS="-march=haswell" CXXFLAGS="-march=haswell" ASMFLAGS="-march=haswell" ./scripts/configure.sh
2625

27-
RUN ./scripts/build.sh
26+
RUN cd src && ./scripts/build.sh
2827

2928
# security=insecure for tests which use io_uring
30-
RUN --security=insecure CC=${CC:?} CXX=${CXX:?} CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:?} ./scripts/test.sh
29+
RUN --security=insecure cd src && CC=${CC:?} CXX=${CXX:?} CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:?} ./scripts/test.sh
3130

3231
FROM base AS build_and_test_vm
3332

3433
COPY . src
35-
WORKDIR src
3634

3735
ARG CC
3836
ARG CXX
3937
ARG CMAKE_BUILD_TYPE
4038
ARG SKIP_LLVM_TESTS
4139
ARG TOOLCHAIN
4240

43-
RUN CC=${CC:?} CXX=${CXX:?} CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:?} CMAKE_TOOLCHAIN_FILE=category/core/toolchains/${TOOLCHAIN:?}.cmake ./scripts/configure.sh
44-
RUN cmake build -DMONAD_COMPILER_TESTING=On -DMONAD_COMPILER_LLVM=On
41+
RUN cd src && CC=${CC:?} CXX=${CXX:?} CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:?} CMAKE_TOOLCHAIN_FILE=category/core/toolchains/${TOOLCHAIN:?}.cmake ./scripts/configure.sh
42+
RUN cd src && cmake build -DMONAD_COMPILER_TESTING=On -DMONAD_COMPILER_LLVM=On
4543

46-
RUN ./scripts/vm/build-tests.sh
47-
RUN SKIP_LLVM_TESTS=${SKIP_LLVM_TESTS:?} ./scripts/vm/test.sh
44+
RUN cd src && ./scripts/vm/build-tests.sh
45+
RUN cd src && SKIP_LLVM_TESTS=${SKIP_LLVM_TESTS:?} ./scripts/vm/test.sh
4846

4947
FROM base AS code_quality
5048

5149
COPY . src
52-
WORKDIR src
5350

54-
RUN CMAKE_TOOLCHAIN_FILE=category/core/toolchains/gcc-avx2.cmake cmake -S . -B build \
51+
RUN cd src && CMAKE_TOOLCHAIN_FILE=category/core/toolchains/gcc-avx2.cmake cmake -S . -B build \
5552
-DMONAD_COMPILER_BENCHMARKS=On \
5653
-DMONAD_COMPILER_LLVM=On \
5754
-DMONAD_COMPILER_TESTING=On \
5855
-DCMAKE_BUILD_TYPE=Debug \
5956
-DCMAKE_C_COMPILER=clang-19 \
6057
-DCMAKE_CXX_COMPILER=clang++-19
6158

62-
RUN ./scripts/check-clang-tidy.sh
59+
RUN cd src && ./scripts/check-clang-tidy.sh
6360

6461
FROM base AS vm_fuzz
6562

6663
RUN apt-get update && apt-get install -y tmux
6764

6865
COPY . src
69-
WORKDIR src
7066

71-
RUN CMAKE_TOOLCHAIN_FILE=category/core/toolchains/gcc-avx2.cmake cmake -S . -B build \
67+
RUN cd src && CMAKE_TOOLCHAIN_FILE=category/core/toolchains/gcc-avx2.cmake cmake -S . -B build \
7268
-GNinja \
7369
-DCMAKE_BUILD_TYPE=Release \
7470
-DMONAD_COMPILER_LLVM=Off \
7571
-DMONAD_COMPILER_TESTING=On \
7672
-DCMAKE_C_COMPILER=clang-19 \
7773
-DCMAKE_CXX_COMPILER=clang++-19
7874

79-
RUN cmake --build build -t monad-compiler-fuzzer
80-
RUN ./scripts/vm/ci-fuzzer.sh
75+
RUN cd src && cmake --build build -t monad-compiler-fuzzer
76+
RUN cd src && ./scripts/vm/ci-fuzzer.sh
8177

8278
FROM base AS runner
8379
COPY --from=build_and_test /src/build/category/mpt/monad_mpt /usr/local/bin/

0 commit comments

Comments
 (0)