1 Commits

Author SHA1 Message Date
Tom Alexander
2e77d9c95f Use ADD command for pulling git repos.
Some checks failed
foreign-document-test Build foreign-document-test has started
rust-test Build rust-test has started
build Build build has started
format Build format has succeeded
clippy Build clippy has failed
This is to fix buildkit caching.
2026-07-09 22:29:20 -04:00
2 changed files with 11 additions and 19 deletions

View File

@@ -119,7 +119,7 @@ spec:
- --import-cache
- "type=registry,ref=$(params.image-name):buildcache"
- --export-cache
- "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,image-manifest=true,oci-mediatypes=true"
- "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
- --opt
- build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
- name: BUILDKITD_TOML

View File

@@ -17,17 +17,13 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
FROM build AS build-emacs
ARG EMACS_REPO
ARG EMACS_VERSION
ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
ADD https://code.fizz.buzz/mirror/emacs.git#emacs-29.1 /root/emacs
WORKDIR /root/emacs
RUN <<EOF
mkdir /root/dist
./autogen.sh
./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
make
make DESTDIR="/root/dist" install
EOF
RUN mkdir /root/dist
RUN ./autogen.sh
RUN ./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
RUN make
RUN make DESTDIR="/root/dist" install
FROM build AS build-org-mode
@@ -39,10 +35,8 @@ RUN mkdir /root/dist
RUN git clone $ORG_MODE_REPO /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION
# RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin $ORG_REPO && git -C /root/org-mode fetch origin $ORG_VERSION && git -C /root/org-mode checkout FETCH_HEAD
WORKDIR /root/org-mode
RUN <<EOF
make compile
make DESTDIR="/root/dist" install
EOF
RUN make compile
RUN make DESTDIR="/root/dist" install
FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS tester
@@ -122,10 +116,8 @@ RUN mkdir -p $LITERATE_BUILD_EMACS_PATH && git -C $LITERATE_BUILD_EMACS_PATH ini
RUN rm $LITERATE_BUILD_EMACS_PATH/unused/aws.org
FROM tester as foreign-document
RUN <<EOF
apk add --no-cache bash coreutils
mkdir /foreign_documents
EOF
RUN apk add --no-cache bash coreutils
RUN mkdir /foreign_documents
COPY --link --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams
COPY --link --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs
COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg