Skip to content

Commit

Permalink
Docker images: Ensure crucible-{debug,syntax} is copied over
Browse files Browse the repository at this point in the history
This fixed an oversight from #1297 in which `crux` gained additional
`crucible-debug` and `crucble-syntax` dependencies, but these dependencies were
not reflected in the `crux-llvm` or `crux-mir` Docker images. Easily fixed.

Towards a fix for #1302.
  • Loading branch information
RyanGlScott committed Feb 11, 2025
1 parent e7957b6 commit 31a59e4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/Dockerfile-crux-llvm
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ RUN apt-get update && \
ARG CRUX_BUILD_DIR=/crux-llvm/build
RUN mkdir -p ${CRUX_BUILD_DIR}
ADD crucible ${CRUX_BUILD_DIR}/crucible
ADD crucible-debug ${CRUX_BUILD_DIR}/crucible-debug
ADD crucible-llvm ${CRUX_BUILD_DIR}/crucible-llvm
ADD crucible-symio ${CRUX_BUILD_DIR}/crucible-symio
ADD crucible-syntax ${CRUX_BUILD_DIR}/crucible-syntax
ADD crux ${CRUX_BUILD_DIR}/crux
ADD crux-llvm ${CRUX_BUILD_DIR}/crux-llvm
ADD dependencies ${CRUX_BUILD_DIR}/dependencies
Expand Down
1 change: 1 addition & 0 deletions .github/Dockerfile-crux-mir
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN apt-get update && \
RUN mkdir -p ${CRUX_BUILD_DIR}
ADD crucible ${CRUX_BUILD_DIR}/crucible
ADD crucible-concurrency ${CRUX_BUILD_DIR}/crucible-concurrency
ADD crucible-debug ${CRUX_BUILD_DIR}/crucible-debug
ADD crucible-mir ${CRUX_BUILD_DIR}/crucible-mir
ADD crucible-syntax ${CRUX_BUILD_DIR}/crucible-syntax
ADD crux ${CRUX_BUILD_DIR}/crux
Expand Down
2 changes: 2 additions & 0 deletions .github/cabal.project.crux-llvm
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
packages:
crucible/
crucible-debug/
crucible-llvm/
crucible-symio/
crucible-syntax/
crux/
crux-llvm/

Expand Down
1 change: 1 addition & 0 deletions .github/cabal.project.crux-mir
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
packages:
crucible/
crucible-concurrency/
crucible-debug/
crucible-mir/
crucible-syntax/
crux/
Expand Down

0 comments on commit 31a59e4

Please sign in to comment.