From 7d4100d9564efbafc9cdca60c9014e175138e4a2 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 13 Sep 2023 16:49:35 -0400 Subject: [PATCH] Add worg to the foreign document test. A lot of the documents are failing so there are going to be a lot of bug fixes in this branch. --- docker/organic_test/Dockerfile | 10 ++++++++-- .../organic_test/foreign_document_test_entrypoint.sh | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/organic_test/Dockerfile b/docker/organic_test/Dockerfile index f0c31d70..dd95ecbf 100644 --- a/docker/organic_test/Dockerfile +++ b/docker/organic_test/Dockerfile @@ -88,14 +88,20 @@ ARG DOOMEMACS_PATH=/foreign_documents/doomemacs ARG DOOMEMACS_REPO=https://github.com/doomemacs/doomemacs.git RUN mkdir -p $DOOMEMACS_PATH && git -C $DOOMEMACS_PATH init --initial-branch=main && git -C $DOOMEMACS_PATH remote add origin $DOOMEMACS_REPO && git -C $DOOMEMACS_PATH fetch origin $DOOMEMACS_VERSION && git -C $DOOMEMACS_PATH checkout FETCH_HEAD +ARG WORG_VERSION=74e80b0f7600801b1d1594542602394c085cc2f9 +ARG WORG_PATH=/foreign_documents/worg +ARG WORG_REPO=https://git.sr.ht/~bzg/worg +RUN mkdir -p $WORG_PATH && git -C $WORG_PATH init --initial-branch=main && git -C $WORG_PATH remote add origin $WORG_REPO && git -C $WORG_PATH fetch origin $WORG_VERSION && git -C $WORG_PATH checkout FETCH_HEAD + FROM tester as foreign-document-test RUN apk add --no-cache bash coreutils RUN mkdir /foreign_documents -COPY --from=build-org-mode /root/org-mode /foreign_documents/org-mode -COPY --from=build-emacs /root/emacs /foreign_documents/emacs COPY --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams COPY --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs +COPY --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg +COPY --from=build-org-mode /root/org-mode /foreign_documents/org-mode +COPY --from=build-emacs /root/emacs /foreign_documents/emacs COPY foreign_document_test_entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/organic_test/foreign_document_test_entrypoint.sh b/docker/organic_test/foreign_document_test_entrypoint.sh index 6dbea8c8..429554a4 100644 --- a/docker/organic_test/foreign_document_test_entrypoint.sh +++ b/docker/organic_test/foreign_document_test_entrypoint.sh @@ -32,6 +32,8 @@ function main { if [ "$?" -ne 0 ]; then all_status=1; fi (run_compare_function "emacs" compare_all_org_document "/foreign_documents/emacs") if [ "$?" -ne 0 ]; then all_status=1; fi + (run_compare_function "worg" compare_all_org_document "/foreign_documents/worg") + if [ "$?" -ne 0 ]; then all_status=1; fi (run_compare_function "howard_abrams" compare_howard_abrams) if [ "$?" -ne 0 ]; then all_status=1; fi (run_compare_function "doomemacs" compare_all_org_document "/foreign_documents/doomemacs")