From ced8b258be630b70bb42edbe2418547b26f56934 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Fri, 23 Sep 2022 10:59:51 +0200 Subject: [PATCH] Fix stack config, nightly build --- .github/workflows/nightly.yml | 13 ++++++------- stack.yaml | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 86f719cf6..165939674 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -24,10 +24,10 @@ jobs: ghc --version cabal --version cabal v2-update - cabal v2-build --dependencies-only + cabal v2-build --dependencies-only pandoc-cli - name: Build run: | - cabal v2-install -fnightly + cabal v2-install -fnightly pandoc-cli strip $HOME/.cabal/bin/pandoc - name: Install artifact run: | @@ -50,14 +50,14 @@ jobs: - name: Install dependencies run: | stack update - stack build --dependencies-only pandoc + stack build --dependencies-only pandoc-cli - name: Build artifacts shell: cmd run: | for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a set ARTIFACTS=%CD%\nightly-windows\pandoc-nightly-windows-%THEDATE% mkdir %ARTIFACTS% - stack build --flag pandoc:nightly --flag pandoc:embed_data_files pandoc + stack build --flag pandoc:nightly --flag pandoc:embed_data_files pandoc-cli forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C copy @path %%ARTIFACTS%%" copy COPYRIGHT %ARTIFACTS% ren %ARTIFACTS%\COPYRIGHT COPYRIGHT.txt @@ -76,12 +76,12 @@ jobs: - name: Install dependencies run: | stack update - stack build --dependencies-only pandoc + stack build --dependencies-only pandoc-cli - name: Build artifacts run: | export ARTIFACTS=nightly-macos/pandoc-nightly-macos-$(date +%Y-%m-%d) mkdir -p ${ARTIFACTS} - stack build --flag pandoc:nightly --flag pandoc:embed_data_files pandoc + stack build --flag pandoc:nightly --flag pandoc:embed_data_files pandoc-cli for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${ARTIFACTS}/; done mv ${ARTIFACTS}/pandoc ${ARTIFACTS}/pandoc cp COPYRIGHT ${ARTIFACTS}/ @@ -90,4 +90,3 @@ jobs: with: name: nightly-macos path: nightly-macos - diff --git a/stack.yaml b/stack.yaml index bb7f15187..4a9c4d65a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,6 +5,8 @@ flags: old-random: false packages: - '.' +- 'pandoc-cli' +- 'pandoc-server' extra-deps: - skylighting-core-0.13 - skylighting-0.13