From fa1f8d4ab696fe79f0f1fb32c6e25704c2b67363 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 3 Sep 2023 04:07:59 +0200 Subject: [PATCH 1/2] MISC: mknews.sh: print news in chronological order Signed-off-by: Tim Janik --- misc/mknews.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/mknews.sh b/misc/mknews.sh index e20846a6..4c27f829 100755 --- a/misc/mknews.sh +++ b/misc/mknews.sh @@ -32,6 +32,7 @@ echo 'Development version - may contain bugs or compatibility issues.' echo echo '``````````````````````````````````````````````````````````````````````````````````````' git log --pretty='%s # %cd %an %h%n%w(0,4,4)%b' \ + --reverse \ --first-parent --date=short "$NEWS_TAG..HEAD" | sed -e '/^\s*Signed-off-by:.*<.*@.*>/d' | sed '/^\s*$/{ N; /^\s*\n\s*$/D }' From ec144c520dac69065d514e659bcbabb838e9907e Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 5 Sep 2023 23:48:39 +0200 Subject: [PATCH 2/2] MISC: Dockerfile.focal: remove NOTEX argument Signed-off-by: Tim Janik --- misc/Dockerfile.focal | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/misc/Dockerfile.focal b/misc/Dockerfile.focal index 10585ad1..ad865df2 100644 --- a/misc/Dockerfile.focal +++ b/misc/Dockerfile.focal @@ -7,9 +7,6 @@ ENV DEBIAN_FRONTEND noninteractive # Use BASH(1) as shell, affects the RUN commands below RUN ln -sf bash /bin/sh && ls -al /bin/sh -# Save +615MB by skipping TeX -ARG NOTEX - # Upgrade packages, install dependencies, clean up to shrink Docker image # Add libXss.so, libgtk-3-0 for Electron RUN apt-get update \ @@ -24,10 +21,9 @@ RUN apt-get update \ gettext libgconf-2-4 libgtk2.0-dev libgtk-3-dev squashfs-tools zstd \ libgtk-3-0 libxss1 libgbm1 libnss3 \ xvfb twm ffmpeg doxygen \ + && apt-get install -y \ + texlive-xetex fonts-sil-charis texlive-binaries texlive-fonts-extra \ && pip install poxy \ - && (test "${NOTEX:-false}" = true \ - || apt-get install -y \ - texlive-xetex fonts-sil-charis texlive-binaries texlive-fonts-extra ) \ && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ && apt-get install -y nodejs \ && apt-get clean