Skip to content

Commit

Permalink
Merge branch 'fix/logging'
Browse files Browse the repository at this point in the history
  • Loading branch information
Witiko committed Jan 18, 2024
2 parents ec143b1 + 0e32024 commit 7a4e6ad
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 55 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ jobs:
repository: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name || github.repository }}
ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
fetch-depth: 0
- name: Set safe Git directory
# This should have been done by the previous step.
# See also: <https://github.com/actions/checkout/issues/915>.
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: Test Lua command-line interface
run: |
set -ex
Expand Down
13 changes: 12 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,18 @@ Default Renderer Prototypes:

Unit Tests:

- In pull requests, process added and modified testfiles first. (feafe9b9)
- In pull requests, process added and modified testfiles first.
(feafe9b9, 9ff530da, 18deae73)

Deprecation:

- Replace all instances of `\markdownInfo`, `\markdownWarning`, and
`\markdownError` with l3msg functions and deprecate `\markdownInfo`,
`\markdownWarning`, and `\markdownError`. (#383, #398)

Docker:

- Uninstall the distribution Markdown package. (258a73d4)

## 3.3.0 (2023-12-30)

Expand Down
29 changes: 27 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ARG DEV_DEPENDENCIES="\
ARG BINARY_DIR=/usr/local/bin
ARG BUILD_DIR=/git-repo
ARG INSTALL_DIR=/usr/local/texlive/texmf-local
ARG PREINSTALLED_DIR=/usr/local/texlive/*/texmf-dist

ARG FROM_IMAGE=texlive/texlive
ARG TEXLIVE_TAG=latest
Expand All @@ -48,6 +49,7 @@ ARG DEPENDENCIES

ARG BUILD_DIR
ARG INSTALL_DIR
ARG PREINSTALLED_DIR

ARG DEV_IMAGE

Expand All @@ -70,7 +72,14 @@ apt-get -qy install --no-install-recommends ${DEPENDENCIES}
# Generate the ConTeXt file database
mtxrun --generate

# Install the Markdown package
# Uninstall the distribution Markdown package
rm -rfv ${PREINSTALLED_DIR}/tex/luatex/markdown/
rm -rfv ${PREINSTALLED_DIR}/scripts/markdown/
rm -rfv ${PREINSTALLED_DIR}/tex/generic/markdown/
rm -rfv ${PREINSTALLED_DIR}/tex/latex/markdown/
rm -rfv ${PREINSTALLED_DIR}/tex/context/third/markdown/

# Install the current Markdown package
make -C ${BUILD_DIR} implode
make -C ${BUILD_DIR} base
mkdir -p ${INSTALL_DIR}/tex/luatex/markdown/
Expand Down Expand Up @@ -114,6 +123,7 @@ ARG DEV_DEPENDENCIES
ARG BINARY_DIR
ARG BUILD_DIR
ARG INSTALL_DIR
ARG PREINSTALLED_DIR

ARG DEV_IMAGE

Expand All @@ -123,6 +133,21 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV TERM=xterm
ENV TEXMFLOCAL=${INSTALL_DIR}

RUN <<EOF

set -o errexit
set -o nounset
set -o xtrace

# Uninstall the distribution Markdown package
rm -rfv ${PREINSTALLED_DIR}/tex/luatex/markdown/
rm -rfv ${PREINSTALLED_DIR}/scripts/markdown/
rm -rfv ${PREINSTALLED_DIR}/tex/generic/markdown/
rm -rfv ${PREINSTALLED_DIR}/tex/latex/markdown/
rm -rfv ${PREINSTALLED_DIR}/tex/context/third/markdown/

EOF

# Install the Markdown package
COPY --from=build ${BUILD_DIR}/dist ${INSTALL_DIR}/

Expand Down Expand Up @@ -151,7 +176,7 @@ fi
apt-get -qy autoclean
apt-get -qy clean
apt-get -qy autoremove --purge
rm -rf ${AUXILIARY_FILES}
rm -rfv ${AUXILIARY_FILES}

# Generate the ConTeXt file database
mtxrun --generate
Expand Down
Loading

0 comments on commit 7a4e6ad

Please sign in to comment.