Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add git shallow clones #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add git shallow clones #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1cd5e3
Add git shallow clones
Daniel-Worrall Jan 15, 2020
5f17b7b
Remove broken sha references
Daniel-Worrall Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions darwin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ $(CURDIR)/../omnibus/crystal-darwin-x86_64:
$(OUTPUT_DIR)/$(DARWIN_NAME) $(OUTPUT_DIR)/$(DARWIN_PKG_NAME): ## Build omnibus crystal project
ifeq ($(FORCE_GIT_TAGGED), 0)
rm -Rf $(CURDIR)/tmp && mkdir -p $(CURDIR)/tmp && cd $(CURDIR)/tmp \
&& git clone https://github.com/crystal-lang/crystal \
&& git clone --branch $(CRYSTAL_SHA1) --depth 1 https://github.com/crystal-lang/crystal \
&& cd crystal \
&& git checkout $(CRYSTAL_SHA1) \
&& git checkout -b $(CRYSTAL_VERSION)
endif

Expand Down
3 changes: 1 addition & 2 deletions docs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ RUN crystal --version

ARG output_docs_base_name
ARG crystal_sha1
RUN git clone https://github.com/crystal-lang/crystal \
RUN git clone --branch ${crystal_sha1} --depth 1 https://github.com/crystal-lang/crystal \
&& cd crystal \
&& git checkout ${crystal_sha1} \
\
&& make docs \
&& git describe --tags --long --always 2>/dev/null > ./docs/revision.txt \
Expand Down
23 changes: 9 additions & 14 deletions linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
ARG gc_version
ARG libatomic_ops_version
COPY files/feature-thread-stackbottom-upstream.patch /tmp/
RUN git clone https://github.com/ivmai/bdwgc \
RUN git clone --branch ${gc_version} --depth 1 https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
&& git clone --branch ${libatomic_ops_version} --depth 1 https://github.com/ivmai/libatomic_ops \
&& cd libatomic_ops \
\
&& patch -p1 < /tmp/feature-thread-stackbottom-upstream.patch \
\
Expand All @@ -29,9 +28,8 @@ RUN git clone https://github.com/ivmai/bdwgc \
# Cross-compile crystal and build libcrystal.a
ARG crystal_sha1
ARG musl_target
RUN git clone https://github.com/crystal-lang/crystal \
RUN git clone --branch ${crystal_sha1} --depth 1 https://github.com/crystal-lang/crystal \
&& cd crystal \
&& git checkout ${crystal_sha1} \
\
&& make deps

Expand All @@ -54,11 +52,10 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
# Build libgc (again, this time for musl)
ARG gc_version
ARG libatomic_ops_version
RUN git clone https://github.com/ivmai/bdwgc \
RUN git clone --branch ${gc_version} --depth 1 https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
&& git clone --branch ${libatomic_ops_version} --depth 1 https://github.com/ivmai/libatomic_ops \
&& cd libatomic_ops \
\
&& ./autogen.sh \
&& ./configure --disable-debug --disable-shared --enable-large-config \
Expand All @@ -78,9 +75,8 @@ RUN mkdir -p /tmp/crystal \
ARG crystal_version
ARG crystal_sha1
ARG gnu_target
RUN git clone https://github.com/crystal-lang/crystal \
RUN git clone --branch ${crystal_sha1} --depth 1 https://github.com/crystal-lang/crystal \
&& cd crystal \
&& git checkout ${crystal_sha1} \
\
&& make crystal stats=true static=true ${release:+release=true} \
CRYSTAL_CONFIG_TARGET=${gnu_target} \
Expand All @@ -89,9 +85,8 @@ RUN git clone https://github.com/crystal-lang/crystal \
# Build shards
ARG shards_version
ARG musl_target
RUN git clone https://github.com/crystal-lang/shards \
RUN git clone --branch ${shards_version} --depth 1 https://github.com/crystal-lang/shards \
&& cd shards \
&& git checkout ${shards_version} \
\
# Hack to make shards not segfault
&& echo 'require "llvm/lib_llvm"; require "llvm/enums"; require "./src/shards"' > hack.cr \
Expand Down