From 190d650f2ca3554815e11c177f9a1da9303cbcb8 Mon Sep 17 00:00:00 2001 From: Katrina Knight Date: Fri, 27 Sep 2024 21:43:01 +0100 Subject: [PATCH] chore: move branch to master --- .devcontainer/Dockerfile | 4 ++-- Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ca9827e..8a13b08 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -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 diff --git a/Dockerfile b/Dockerfile index c627f46..5a3e74a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -11,4 +11,4 @@ WORKDIR /home/Gigamonkey COPY . . RUN cmake -B build -S . -DPACKAGE_TESTS=OFF RUN cmake --build . -RUN cmake --install . \ No newline at end of file +RUN cmake --install .