@@ -111,14 +111,12 @@ jobs:
111111 export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
112112 export BASEDIR=$(pwd)
113113 export ARTIFACTS=${BASEDIR}/macos-release-candidate
114− export DIST=${BASEDIR}/macos_package
115114 export RESOURCES=${ARTIFACTS}/Resources
116− export ROOT=${DIST}/pandoc
115+ export ROOT=${ARTIFACTS}/pandoc
117116 export DEST=${ROOT}/usr/local
118117 export ME=$(whoami)
119118 export BASE=pandoc-$VERSION
120119 mkdir -p ${ARTIFACTS}
121− mkdir -p ${DIST}
122120 mkdir -p ${RESOURCES}
123121 mkdir -p ${DEST}/bin
124122 mkdir -p ${DEST}/share/man/man1
@@ -131,17 +129,10 @@ jobs:
131129 $DEST/share/man/man1/pandoc-citeproc.1
132130 ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
133131 -o ${RESOURCES}/license.html
132+ chown -R $ME:staff ${ROOT}
134133 sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
135−
136− chown -R $ME:staff ${DIST}
137− echo Creating pkg...
138− pkgbuild --root $ROOT --identifier net.johnmacfarlane.pandoc --version $VERSION --ownership recommended ${ARTIFACTS}/pandoc.pkg
139− echo Creating zip...
140− cd ${DEST}
141− cd ..
142− mv local ${BASE}
143− zip -r ${ARTIFACTS}/${BASE}-macOS.zip ${BASE}
144− echo -e "${BASE}-macOS.pkg: pandoc.pkg\n\tproductbuild --distribution distribution.xml --resources Resources --package-path $< --version ${VERSION} --sign 'Developer ID Installer: John Macfarlane' -o \$@\n" > ${ARTIFACTS}/Makefile
134+ cp macos/Makefile ${ARTIFACTS}/
135+ echo ${VERSION} > ${ARTIFACTS}/version.txt
145136 - uses: actions/upload-artifact@master
146137 with:
147138 name: macos-release-candidate