diff options
| author | John MacFarlane <[email protected]> | 2023-03-12 12:25:22 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2023-03-12 12:25:22 -0700 |
| commit | 5033687724bad11cac7b22b8346bcaa635819725 (patch) | |
| tree | 8b1cdec0ef31bf0d32f20edf7635cc19daf057c4 | |
| parent | fcb8f070773200dedfa97384f6c6a8b6a5ad6128 (diff) | |
More cirrus tweaks.
Ensure that the binary is built again even if it exists in the cache.
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | linux/make_artifacts.sh | 10 | ||||
| -rw-r--r-- | macos/make_macos_release.sh | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 468f4976b..de0ed565d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -33,7 +33,7 @@ task: fingerprint_key: linux_arm64_2023_03_11 build_script: - 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=. + - cabal install --reinstall -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: diff --git a/linux/make_artifacts.sh b/linux/make_artifacts.sh index ff7650129..f795655a4 100644 --- a/linux/make_artifacts.sh +++ b/linux/make_artifacts.sh @@ -21,7 +21,7 @@ mkdir -p $ARTIFACTS rm -f $ARTIFACTS/DONE clean_up() { - echo "All done!" > "$ARTIFACTS/DONE" + echo "Exiting with error..." } trap clean_up EXIT @@ -29,14 +29,13 @@ echo "Copying and stripping pandoc binary" cp "$ROOT/pandoc" "$ARTIFACTS/pandoc" strip "$ARTIFACTS/pandoc" -echo "Performing sanity checks on binary..." -# Confirm that we have static builds +echo "Checking that the binary is statically linked..." file "$ARTIFACTS/pandoc" | grep "statically linked" -# Confirm that it has +lua and +server support +echo "Checking that the binary has +lua and +server support..." "$ARTIFACTS/pandoc" --version | grep -q '+server +lua' -# Confirm that it has data files baked in: +echo "Checking that the binary has data files baked in..." strings "$ARTIFACTS/pandoc" | grep -q '\$title\$' make_deb() { @@ -107,4 +106,5 @@ make_deb echo "Making tarball..." make_tarball +echo "Finished!" exit 0 diff --git a/macos/make_macos_release.sh b/macos/make_macos_release.sh index 7926de19f..22f887fff 100644 --- a/macos/make_macos_release.sh +++ b/macos/make_macos_release.sh @@ -9,8 +9,9 @@ ME=$(whoami) # Build the pandoc binary and put it in . cabal update -cabal install pandoc-cli -fembed_data_files -fserver -flua --installdir=. \ - --install-method=copy --overwrite-policy=always +cabal install pandoc-cli --reinstall \ + -fembed_data_files -fserver -flua \ + --installdir=. --install-method=copy --overwrite-policy=always echo "Built executable..." # Create directories |