diff options
| author | John MacFarlane <[email protected]> | 2022-09-29 10:15:45 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2022-09-29 10:19:30 -0700 |
| commit | 57fd3c4f81138aaaf52acb876f088611beeb8542 (patch) | |
| tree | e010fdadccad36814d2a04a4c1f7a0565317e98c | |
| parent | c974ed0caea0e1266ba7a606a7bf6e35b050df13 (diff) | |
cabal.project: move back to using `flags:`.
If we add the flag to constraints, it can't be overridden on
the command line.
| -rw-r--r-- | .github/workflows/nightly.yml | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cabal.project | 4 | ||||
| -rw-r--r-- | linux/make_artifacts.sh | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 165939674..669acceb3 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 pandoc-cli + cabal v2-build --dependencies-only -fembed_data_files -fnightly pandoc-cli - name: Build run: | - cabal v2-install -fnightly pandoc-cli + cabal v2-install -fembed_data_files -fnightly pandoc-cli strip $HOME/.cabal/bin/pandoc - name: Install artifact run: | @@ -21,7 +21,7 @@ BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T --non quick-cabal: quick-cabal-test ## tests and build executable cabal build \ --ghc-options='$(GHCOPTS)' \ - --disable-optimization pandoc-cli + --disable-optimization all .PHONY: quick-cabal # Note: to accept current results of golden tests, diff --git a/cabal.project b/cabal.project index 75700ec4e..5a31cac5c 100644 --- a/cabal.project +++ b/cabal.project @@ -2,8 +2,8 @@ packages: . pandoc-server pandoc-cli tests: True -constraints: pandoc +embed_data_files, - aeson >= 2.0.1.0, +flags: +embed_data_files +constraints: aeson >= 2.0.1.0, skylighting-format-blaze-html >= 0.1.1 source-repository-package diff --git a/linux/make_artifacts.sh b/linux/make_artifacts.sh index 370092a10..1acdf4a91 100644 --- a/linux/make_artifacts.sh +++ b/linux/make_artifacts.sh @@ -27,8 +27,7 @@ ghc --version cabal update cabal clean -cabal configure -f-export-dynamic -fembed_data_files --enable-executable-static --ghc-options '-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' pandoc -cabal build -j4 +cabal build -f-export-dynamic -fembed_data_files --enable-executable-static --ghc-options '-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' -j4 all for f in $(find dist-newstyle -name 'pandoc' -type f -perm /400); do cp $f $ARTIFACTS/; done # Confirm that we have static builds |