@@ -31,20 +31,10 @@ jobs:
32 - osarch: "windows-x86_64"
32 - osarch: "windows-x86_64"
33 arch: "x64"
33 arch: "x64"
35 stack_opts: "-j1"
34 stack_opts: "-j1"
36− # - osarch: "windows-i386"
38− # choco_opts: "--x86 --version 2.1.3.20190715"
39− # stack_opts: "-j1 --flag hslua:lua_32bits"
40− # # we use stack 2.1.3 because 2.3.1 doesn't support i386
43 - uses: actions/checkout@v1
37 - uses: actions/checkout@v1
44− - name: Install stack
47− choco install haskell-stack ${{ matrix.versions.choco_opts }}
48 - name: Install dependencies
38 - name: Install dependencies
50 stack update
40 stack update
@@ -92,50 +82,3 @@ jobs:
93 name: windows-release-candidate
83 name: windows-release-candidate
94 path: windows-release-candidate
84 path: windows-release-candidate
96−# We now build for macos on travis-ci.com
99−# runs-on: macOS-10.15
102−# - uses: actions/checkout@v1
103−# - name: Install stack
105−# curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
106−# tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
107−# - name: Install dependencies
110−# ./stack build --dependencies-only pandoc pandoc-citeproc
111−# - name: Create macOS package
113−# export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
114−# export BASEDIR=$(pwd)
115−# export ARTIFACTS=${BASEDIR}/macos-release-candidate
116−# export RESOURCES=${ARTIFACTS}/Resources
117−# export ROOT=${ARTIFACTS}/pandoc
118−# export DEST=${ROOT}/usr/local
119−# export ME=$(whoami)
120−# export BASE=pandoc-$VERSION
121−# mkdir -p ${ARTIFACTS}
122−# mkdir -p ${RESOURCES}
123−# mkdir -p ${DEST}/bin
124−# mkdir -p ${DEST}/share/man/man1
125−# ./stack build pandoc pandoc-citeproc
126−# for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${DEST}/bin/; done
127−# strip ${DEST}/bin/pandoc
128−# strip ${DEST}/bin/pandoc-citeproc
129−# cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
130−# ${DEST}/bin/pandoc-citeproc --man > \
131−# $DEST/share/man/man1/pandoc-citeproc.1
132−# ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
133−# -o ${RESOURCES}/license.html
134−# chown -R $ME:staff ${ROOT}
135−# sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
136−# cp macos/Makefile ${ARTIFACTS}/
137−# echo ${VERSION} > ${ARTIFACTS}/version.txt
138−# - uses: actions/upload-artifact@v2
140−# name: macos-release-candidate
141−# path: macos-release-candidate