diff options
| -rw-r--r-- | .cirrus.yml | 5 | ||||
| -rw-r--r-- | linux/make_artifacts.sh | 15 |
2 files changed, 5 insertions, 15 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index db8e505d7..c133c0eeb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,8 +32,11 @@ task: folder: ~/.cabal/store fingerprint_key: linux_arm64_2023_03_11 build_script: - - ARTIFACTS=./linux/artifacts sh linux/make_artifacts.sh + - cabal update + - cabal install -f-export-dynamic -fembed_data_files -fserver -flua --enable-executable-static -j4 --ghc-options="-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread" pandoc-cli --install-method=copy --overwrite-policy=always --installdir=. upload_caches: - cabal_store + package_script: + - ARTIFACTS=./linux/artifacts sh linux/make_artifacts.sh artifacts: path: ./linux/artifacts/* diff --git a/linux/make_artifacts.sh b/linux/make_artifacts.sh index 4b1c2d519..a22fda039 100644 --- a/linux/make_artifacts.sh +++ b/linux/make_artifacts.sh @@ -2,8 +2,6 @@ set -e ROOT="$(pwd)" -CABALOPTS="-f-export-dynamic -fembed_data_files --enable-executable-static -j4" -GHCOPTS="-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread" MACHINE=$(uname -m) case "$MACHINE" in @@ -26,18 +24,7 @@ clean_up() { } trap clean_up EXIT -# build binaries - -cabal --version -ghc --version - -cabal update -cabal clean -cabal build $CABALOPTS --ghc-options="$GHCOPTS" all -cabal test $CABALOPTS --ghc-options="$GHCOPTS" all - -# Copy executable to ARTIFACTS -find dist-newstyle -name 'pandoc' -type f -perm /400 -exec cp {} "$ARTIFACTS"/ \; +cp pandoc "$ARTIFACTS/pandoc" # Strip executable strip "$ARTIFACTS/pandoc" |