git.iko.soy/typeable/pandoc
on d8f8bb8 help sign in
b8e0b46
swap
18 ahead, 1107 behind
.github/workflows/release-candidate.yml+117−117
since splitsnapshots
unifiedsplit
@@ -22,120 +22,120 @@ jobs:
22 name: linux-release-candidate
22 name: linux-release-candidate
23 path: linux-release-candidate
23 path: linux-release-candidate
24
24
25− windows:
25+# windows:
26−
26+#
27− runs-on: windows-2019
27+# runs-on: windows-2019
28− strategy:
28+# strategy:
29− fail-fast: true
29+# fail-fast: true
30− matrix:
30+# matrix:
31− versions:
31+# versions:
32− - osarch: "windows-x86_64"
32+# - osarch: "windows-x86_64"
33− arch: "x64"
33+# arch: "x64"
34− choco_opts: ""
34+# choco_opts: ""
35− stack_opts: "-j1"
35+# stack_opts: "-j1"
36− - osarch: "windows-i386"
36+# - osarch: "windows-i386"
37− arch: "x86"
37+# arch: "x86"
38− choco_opts: "--x86 --version 2.1.3.20190715"
38+# choco_opts: "--x86 --version 2.1.3.20190715"
39− stack_opts: "-j1 --flag hslua:lua_32bits"
39+# stack_opts: "-j1 --flag hslua:lua_32bits"
40− # we use stack 2.1.3 because 2.3.1 doesn't support i386
40+# # we use stack 2.1.3 because 2.3.1 doesn't support i386
41−
41+#
42− steps:
42+# steps:
43− - uses: actions/checkout@v1
43+# - uses: actions/checkout@v1
44− - name: Install stack
44+# - name: Install stack
45− shell: cmd
45+# shell: cmd
46− run: |
46+# run: |
47− choco install haskell-stack ${{ matrix.versions.choco_opts }}
47+# choco install haskell-stack ${{ matrix.versions.choco_opts }}
48− - name: Install dependencies
48+# - name: Install dependencies
49− run: |
49+# run: |
50− stack update
50+# stack update
51− stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc pandoc-citeproc
51+# stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc pandoc-citeproc
52− - name: Create windows package
52+# - name: Create windows package
53− shell: cmd
53+# shell: cmd
54− run: |
54+# run: |
55− for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
55+# for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
56− stack build ${{ matrix.versions.stack_opts }} pandoc pandoc-citeproc
56+# stack build ${{ matrix.versions.stack_opts }} pandoc pandoc-citeproc
57− for /f "tokens=1-2 delims= " %%a in ('stack exec pandoc -- --version') do (
57+# for /f "tokens=1-2 delims= " %%a in ('stack exec pandoc -- --version') do (
58− @set VERSION=%%b
58+# @set VERSION=%%b
59− goto :next
59+# goto :next
60− )
60+# )
61− :next
61+# :next
62− if "%VERSION%" == "" (
62+# if "%VERSION%" == "" (
63− echo Error: could not determine version number.
63+# echo Error: could not determine version number.
64− exit /b 1
64+# exit /b 1
65− )
65+# )
66− echo Detected version %VERSION%
66+# echo Detected version %VERSION%
67− @set WINDOWS=%CD%\windows
67+# @set WINDOWS=%CD%\windows
68− @set RELEASE=%WINDOWS%\pandoc-%VERSION%
68+# @set RELEASE=%WINDOWS%\pandoc-%VERSION%
69− mkdir %RELEASE%
69+# mkdir %RELEASE%
70− forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
70+# forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
71− stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html
71+# stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html
72− stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf
72+# stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf
73− copy %RELEASE%\COPYING.rtf %WINDOWS%
73+# copy %RELEASE%\COPYING.rtf %WINDOWS%
74− copy COPYRIGHT %RELEASE%\COPYRIGHT.txt
74+# copy COPYRIGHT %RELEASE%\COPYRIGHT.txt
75− cd windows
75+# cd windows
76− echo Creating msi...
76+# echo Creating msi...
77− dir
77+# dir
78− @set WIXBIN="c:\Program Files (x86)\WiX Toolset v3.11\bin"
78+# @set WIXBIN="c:\Program Files (x86)\WiX Toolset v3.11\bin"
79− @set WORKDIR=%CD%
79+# @set WORKDIR=%CD%
80− echo Running candle...
80+# echo Running candle...
81− %WIXBIN%\candle -arch ${{ matrix.versions.arch }} -dVERSION=%VERSION% -dBINPATH=%RELEASE% *.wxs -out wixobj\
81+# %WIXBIN%\candle -arch ${{ matrix.versions.arch }} -dVERSION=%VERSION% -dBINPATH=%RELEASE% *.wxs -out wixobj\
82− if %errorlevel% neq 0 exit /b %errorlevel%
82+# if %errorlevel% neq 0 exit /b %errorlevel%
83− echo Running light...
83+# echo Running light...
84− %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj
84+# %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj
85− 7z a "pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip" pandoc-%VERSION%
85+# 7z a "pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip" pandoc-%VERSION%
86− cd ..
86+# cd ..
87− mkdir windows-release-candidate
87+# mkdir windows-release-candidate
88− copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi windows-release-candidate
88+# copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi windows-release-candidate
89− copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip windows-release-candidate
89+# copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip windows-release-candidate
90− copy windows\Makefile windows-release-candidate
90+# copy windows\Makefile windows-release-candidate
91− - uses: actions/upload-artifact@v2
91+# - uses: actions/upload-artifact@v2
92− with:
92+# with:
93− name: windows-release-candidate
93+# name: windows-release-candidate
94− path: windows-release-candidate
94+# path: windows-release-candidate
95−
95+#
96− macos:
96+# macos:
97−
97+#
98− runs-on: macOS-10.15
98+# runs-on: macOS-10.15
99−
99+#
100− steps:
100+# steps:
101− - uses: actions/checkout@v1
101+# - uses: actions/checkout@v1
102− - name: Install stack
102+# - name: Install stack
103− run: |
103+# run: |
104− curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
104+# curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
105− tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
105+# tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
106− - name: Install dependencies
106+# - name: Install dependencies
107− run: |
107+# run: |
108− ./stack update
108+# ./stack update
109− ./stack build --dependencies-only pandoc pandoc-citeproc
109+# ./stack build --dependencies-only pandoc pandoc-citeproc
110− - name: Create macOS package
110+# - name: Create macOS package
111− run: |
111+# run: |
112− export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
112+# export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
113− export BASEDIR=$(pwd)
113+# export BASEDIR=$(pwd)
114− export ARTIFACTS=${BASEDIR}/macos-release-candidate
114+# export ARTIFACTS=${BASEDIR}/macos-release-candidate
115− export RESOURCES=${ARTIFACTS}/Resources
115+# export RESOURCES=${ARTIFACTS}/Resources
116− export ROOT=${ARTIFACTS}/pandoc
116+# export ROOT=${ARTIFACTS}/pandoc
117− export DEST=${ROOT}/usr/local
117+# export DEST=${ROOT}/usr/local
118− export ME=$(whoami)
118+# export ME=$(whoami)
119− export BASE=pandoc-$VERSION
119+# export BASE=pandoc-$VERSION
120− mkdir -p ${ARTIFACTS}
120+# mkdir -p ${ARTIFACTS}
121− mkdir -p ${RESOURCES}
121+# mkdir -p ${RESOURCES}
122− mkdir -p ${DEST}/bin
122+# mkdir -p ${DEST}/bin
123− mkdir -p ${DEST}/share/man/man1
123+# mkdir -p ${DEST}/share/man/man1
124− ./stack build pandoc pandoc-citeproc
124+# ./stack build pandoc pandoc-citeproc
125− for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${DEST}/bin/; done
125+# for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${DEST}/bin/; done
126− strip ${DEST}/bin/pandoc
126+# strip ${DEST}/bin/pandoc
127− strip ${DEST}/bin/pandoc-citeproc
127+# strip ${DEST}/bin/pandoc-citeproc
128− cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
128+# cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
129− ${DEST}/bin/pandoc-citeproc --man > \
129+# ${DEST}/bin/pandoc-citeproc --man > \
130− $DEST/share/man/man1/pandoc-citeproc.1
130+# $DEST/share/man/man1/pandoc-citeproc.1
131− ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
131+# ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
132− -o ${RESOURCES}/license.html
132+# -o ${RESOURCES}/license.html
133− chown -R $ME:staff ${ROOT}
133+# chown -R $ME:staff ${ROOT}
134− sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
134+# sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
135− cp macos/Makefile ${ARTIFACTS}/
135+# cp macos/Makefile ${ARTIFACTS}/
136− echo ${VERSION} > ${ARTIFACTS}/version.txt
136+# echo ${VERSION} > ${ARTIFACTS}/version.txt
137− - uses: actions/upload-artifact@v2
137+# - uses: actions/upload-artifact@v2
138− with:
138+# with:
139− name: macos-release-candidate
139+# name: macos-release-candidate
140− path: macos-release-candidate
140+# path: macos-release-candidate
141−
141+#
Makefile+7−2
@@ -5,6 +5,7 @@ BRANCH?=master
5RESOLVER?=lts-13
5RESOLVER?=lts-13
6GHCOPTS=-fdiagnostics-color=always
6GHCOPTS=-fdiagnostics-color=always
7WEBSITE=../../web/pandoc.org
7WEBSITE=../../web/pandoc.org
8+REVISION?=1
8
9
9quick:
10quick:
10 stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='-j +RTS -A64m -RTS' --test-arguments='-j4 --hide-successes $(TESTARGS)'
11 stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='-j +RTS -A64m -RTS' --test-arguments='-j4 --hide-successes $(TESTARGS)'
@@ -70,8 +71,12 @@ checkdocs: README.md
70 ! grep -n -e "\t" MANUAL.txt changelog
71 ! grep -n -e "\t" MANUAL.txt changelog
71
72
72debpkg: man/pandoc.1
73debpkg: man/pandoc.1
73− make -C linux && \
74+ docker run -v `pwd`:/mnt \
74− cp linux/artifacts/pandoc-$(version)-*.* .
75+ -v `pwd`/linux/artifacts:/artifacts \
76+ -e REVISION=$(REVISION) \
77+ -w /mnt \
78+ utdemir/ghc-musl:v12-libgmp-ghc8101 bash \
79+ /mnt/linux/make_artifacts.sh
75
80
76macospkg: man/pandoc.1
81macospkg: man/pandoc.1
77 ./macos/make_macos_package.sh
82 ./macos/make_macos_package.sh
cabal.project+1−6
@@ -11,9 +11,4 @@ package pandoc-citeproc
11source-repository-package
11source-repository-package
12 type: git
12 type: git
13 location: https://github.com/jgm/pandoc-citeproc
13 location: https://github.com/jgm/pandoc-citeproc
14− tag: 0.17.0.1
14+ tag: 82833c1d162b19464d9aa2b5d4eb756443d726c9
15−
16− source-repository-package
17− type: git
18− location: https://github.com/jgm/commonmark-hs
19− tag: 8d4442abc443ce0100cc87af797e7df9a72b9b9a
linux/Dockerfiledeleted−30
@@ -1,30 +0,0 @@
1−# USE ALPINE LINUX
2−FROM alpine:3.11
3−RUN apk --no-cache add \
4− alpine-sdk \
5− bash \
6− ca-certificates \
7− cabal \
8− dpkg \
9− fakeroot \
10− ghc \
11− git \
12− gmp-dev \
13− xz \
14− zlib-dev \
15− zlib-static
16−RUN mkdir -p /usr/src/ && \
17− git clone https://github.com/jgm/pandoc /usr/src/pandoc
18−WORKDIR /usr/src/pandoc
19−CMD cabal --version && \
20− ghc --version && \
21− git pull && \
22− git checkout -b work $TREE && \
23− cabal new-update && \
24− cabal new-clean && \
25− cabal new-configure --enable-tests -f-export-dynamic -fstatic -fembed_data_files -fbibutils --ghc-options '-optc-Os -optl=-pthread -optl=-static -fPIC -split-sections' . pandoc-citeproc && \
26− cabal new-build . pandoc-citeproc && \
27− cabal new-test -j1 . pandoc-citeproc && \
28− for f in $(find dist-newstyle -name 'pandoc*' -type f -perm +400); do cp $f /artifacts/; done && \
29− bash linux/make_deb.sh && \
30− bash linux/make_tarball.sh
linux/Makefiledeleted−18
@@ -1,18 +0,0 @@
1−TREE?=HEAD
2−ARTIFACTS=`pwd`/artifacts
3−REVISION?=1
4−
5−build:
6− mkdir -p $(ARTIFACTS)
7− docker build -t alpine-pandoc .
8− docker run --env TREE=$(TREE) --env REVISION=$(REVISION) \
9− -v $(ARTIFACTS):/artifacts alpine-pandoc
10−
11−interact:
12− docker run --env TREE=$(TREE) --env REVISION=$(REVISION) \
13− -v $(ARTIFACTS):/artifacts -it alpine-pandoc bash
14−
15−setup:
16− docker pull alpine:edge
17−
18−.PHONY: build setup interact
linux/make_deb.sh → linux/make_artifacts.shrenamed+36−5
@@ -9,6 +9,20 @@ esac
9
9
10ARTIFACTS="${ARTIFACTS:-/artifacts}"
10ARTIFACTS="${ARTIFACTS:-/artifacts}"
11
11
12+# build binaries
13+
14+cabal --version
15+ghc --version
16+
17+cabal v2-update
18+cabal v2-clean
19+cabal v2-configure --enable-tests -f-export-dynamic -fstatic -fembed_data_files -fbibutils --enable-executable-static --ghc-options '-optc-Os -optl=-pthread -split-sections' . pandoc-citeproc
20+cabal v2-build . pandoc-citeproc
21+cabal v2-test -j1 . pandoc-citeproc
22+for f in $(find dist-newstyle -name 'pandoc*' -type f -perm /400); do cp $f /artifacts/; done
23+
24+# make deb
25+
12VERSION=`$ARTIFACTS/pandoc --version | awk '{print $2; exit;}'`
26VERSION=`$ARTIFACTS/pandoc --version | awk '{print $2; exit;}'`
13REVISION=${REVISION:-1}
27REVISION=${REVISION:-1}
14DEBVER=$VERSION-$REVISION
28DEBVER=$VERSION-$REVISION
@@ -17,8 +31,6 @@ DIST=`pwd`/$BASE
17DEST=$DIST/usr
31DEST=$DIST/usr
18COPYRIGHT=$DEST/share/doc/pandoc/copyright
32COPYRIGHT=$DEST/share/doc/pandoc/copyright
19
33
20−PANDOC_CITEPROC_VERSION=`$ARTIFACTS/pandoc-citeproc --version | awk '{print $2;}'`
21−
22mkdir -p $DEST/bin
34mkdir -p $DEST/bin
23mkdir -p $DEST/share/man/man1
35mkdir -p $DEST/share/man/man1
24mkdir -p $DEST/share/doc/pandoc
36mkdir -p $DEST/share/doc/pandoc
@@ -29,12 +41,12 @@ cp $ARTIFACTS/pandoc $DEST/bin/
29cp $ARTIFACTS/pandoc-citeproc $DEST/bin/
41cp $ARTIFACTS/pandoc-citeproc $DEST/bin/
30strip $DEST/bin/pandoc
42strip $DEST/bin/pandoc
31strip $DEST/bin/pandoc-citeproc
43strip $DEST/bin/pandoc-citeproc
32−cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
44+cp /mnt/man/pandoc.1 $DEST/share/man/man1/pandoc.1
33$ARTIFACTS/pandoc-citeproc --man > $DEST/share/man/man1/pandoc-citeproc.1
45$ARTIFACTS/pandoc-citeproc --man > $DEST/share/man/man1/pandoc-citeproc.1
34gzip -9 $DEST/share/man/man1/pandoc.1
46gzip -9 $DEST/share/man/man1/pandoc.1
35gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
47gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
36
48
37−cp COPYRIGHT $COPYRIGHT
49+cp /mnt/COPYRIGHT $COPYRIGHT
38echo "" >> $COPYRIGHT
50echo "" >> $COPYRIGHT
39echo "pandoc-citeproc" >> $COPYRIGHT
51echo "pandoc-citeproc" >> $COPYRIGHT
40$ARTIFACTS/pandoc-citeproc --license >> $COPYRIGHT
52$ARTIFACTS/pandoc-citeproc --license >> $COPYRIGHT
@@ -46,6 +58,25 @@ perl -pe "s/VERSION/$DEBVER/" linux/control.in | \
46 perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
58 perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
47 > $DIST/DEBIAN/control
59 > $DIST/DEBIAN/control
48
60
61+# we limit compression to avoid OOM error
49−fakeroot dpkg-deb --build $DIST
62+fakeroot dpkg-deb -Zgzip -z7 --build $DIST
50rm -rf $DIST
63rm -rf $DIST
51cp $BASE.deb $ARTIFACTS/
64cp $BASE.deb $ARTIFACTS/
65+
66+# Make tarball
67+
68+TARGET=pandoc-$VERSION
69+cd $ARTIFACTS
70+rm -rf $TARGET
71+mkdir $TARGET
72+mkdir $TARGET/bin $TARGET/share $TARGET/share/man $TARGET/share/man/man1
73+./pandoc-citeproc --man > $TARGET/share/man/man1/pandoc-citeproc.1
74+cp /mnt/man/pandoc.1 $TARGET/share/man/man1
75+mv pandoc pandoc-citeproc $TARGET/bin
76+strip $TARGET/bin/pandoc
77+strip $TARGET/bin/pandoc-citeproc
78+gzip -9 $TARGET/share/man/man1/pandoc.1
79+gzip -9 $TARGET/share/man/man1/pandoc-citeproc.1
80+
81+tar cvzf $TARGET-linux-amd64.tar.gz $TARGET
82+rm -r $TARGET
linux/make_tarball.shdeleted−19
@@ -1,19 +0,0 @@
1−set -e
2−
3−ARTIFACTS="${ARTIFACTS:-/artifacts}"
4−VERSION=`$ARTIFACTS/pandoc --version | awk '{print $2; exit;}'`
5−TARGET=pandoc-$VERSION
6−
7−cd $ARTIFACTS
8−rm -rf $TARGET
9−mkdir $TARGET
10−mkdir $TARGET/bin $TARGET/share $TARGET/share/man $TARGET/share/man/man1
11−./pandoc-citeproc --man > $TARGET/share/man/man1/pandoc-citeproc.1
12−cp /usr/src/pandoc/man/pandoc.1 $TARGET/share/man/man1
13−mv pandoc pandoc-citeproc $TARGET/bin
14−strip $TARGET/bin/pandoc
15−strip $TARGET/bin/pandoc-citeproc
16−gzip -9 $TARGET/share/man/man1/pandoc.1
17−gzip -9 $TARGET/share/man/man1/pandoc-citeproc.1
18−tar cvzf $TARGET-linux-amd64.tar.gz $TARGET
19−rm -r $TARGET