Skip to content

Commit

Permalink
Merge pull request #60 from GaeaKat/redo_cmake
Browse files Browse the repository at this point in the history
feat: made Gigamonkey install
  • Loading branch information
DanielKrawisz authored Sep 27, 2024
2 parents 9591e7d + 190d650 commit 1a655c1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM gigamonkey/gigamonkey-base-dev:v1.1.3

ADD https://api.github.com/repos/DanielKrawisz/data/git/refs/heads/redo_cmake /root/data_version.json
RUN git clone --depth 1 --branch redo_cmake https://github.com/DanielKrawisz/data.git /tmp/data
ADD https://api.github.com/repos/DanielKrawisz/data/git/refs/heads/master /root/data_version.json
RUN git clone --depth 1 --branch master https://github.com/DanielKrawisz/data.git /tmp/data
RUN cmake -B /tmp/data/build -S /tmp/data -DPACKAGE_TESTS=OFF
RUN cmake --build /tmp/data/build
RUN cmake --install /tmp/data/build
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM gigamonkey/gigamonkey-base-dev:v1.1.3

ADD https://api.github.com/repos/DanielKrawisz/data/git/refs/heads/redo_cmake /root/data_version.json
RUN git clone --depth 1 --branch redo_cmake https://github.com/DanielKrawisz/data.git /tmp/data
ADD https://api.github.com/repos/DanielKrawisz/data/git/refs/heads/master /root/data_version.json
RUN git clone --depth 1 --branch master https://github.com/DanielKrawisz/data.git /tmp/data
RUN cmake -B /tmp/data/build -S /tmp/data -DPACKAGE_TESTS=OFF
RUN cmake --build /tmp/data/build
RUN cmake --install /tmp/data/build
Expand All @@ -11,4 +11,4 @@ WORKDIR /home/Gigamonkey
COPY . .
RUN cmake -B build -S . -DPACKAGE_TESTS=OFF
RUN cmake --build .
RUN cmake --install .
RUN cmake --install .

0 comments on commit 1a655c1

Please sign in to comment.