From 8a04e8898388f347531612efb2f9d95a2b8931f4 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 21 Jun 2024 10:33:01 -0400 Subject: [PATCH 1/2] fix(ci): remove osxcross from build image Moves it to the base image --- build-images/Earthfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-images/Earthfile b/build-images/Earthfile index ca3fa661e1b..6efc60d251b 100644 --- a/build-images/Earthfile +++ b/build-images/Earthfile @@ -116,7 +116,6 @@ foundry: # It acts as the base image for all CI builds, and we build on it to produce a developer box. build: BUILD +wasi-sdk - BUILD +osxcross BUILD +foundry FROM +base-build RUN apt update && \ @@ -154,11 +153,6 @@ build: # Install wasi-sdk. COPY +wasi-sdk/opt/wasi-sdk /opt/wasi-sdk - # Install osxcross. Requires developer to mount SDK from their mac host. - COPY +osxcross/opt/osxcross /opt/osxcross - ENV PATH="/opt/osxcross/bin:$PATH" - ENV LD_LIBRARY_PATH="/opt/osxcross/lib:$LD_LIBRARY_PATH" - # Install foundry. COPY +foundry-build/opt/foundry /opt/foundry ENV PATH="/opt/foundry/bin:$PATH" @@ -204,6 +198,7 @@ build: # We want to produce downstream images: devbox and sysbox. This image is the base image for each. # It contains a suite of tools that developers might use to develop aztec. basebox: + BUILD +osxcross BUILD +build FROM +build RUN yes | unminimize @@ -237,6 +232,11 @@ basebox: RUN wget https://github.com/earthly/earthly/releases/latest/download/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly && \ chmod +x /usr/local/bin/earthly + # Install osxcross. Requires developer to mount SDK from their mac host. + COPY +osxcross/opt/osxcross /opt/osxcross + ENV PATH="/opt/osxcross/bin:$PATH" + ENV LD_LIBRARY_PATH="/opt/osxcross/lib:$LD_LIBRARY_PATH" + # Install gh (github cli). RUN mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg > /etc/apt/keyrings/githubcli-archive-keyring.gpg \ && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ From 1baca9f43b8db9ab0ed5a4284fb69575a7e1d053 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 21 Jun 2024 10:48:43 -0400 Subject: [PATCH 2/2] Update Earthfile --- build-images/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images/Earthfile b/build-images/Earthfile index 6efc60d251b..bde05449320 100644 --- a/build-images/Earthfile +++ b/build-images/Earthfile @@ -71,7 +71,7 @@ osxcross: && apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - RUN git clone --depth=1 https://github.com/tpoechtrager/osxcross.git \ + RUN git clone https://github.com/tpoechtrager/osxcross.git \ && cd /osxcross \ && git reset --hard ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b \ && export OSX_SDK="MacOSX14.0.sdk" \