Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
2mol committed Apr 20, 2021
1 parent 51b350c commit 0b1c224
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/cabal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
cabal: ["3.2.0"]
ghc: ["8.10.3"]
cabal: ["3.4.0"]
ghc: ["8.10.4"]
include:
- os: ubuntu-latest
os_name: linux
Expand Down Expand Up @@ -48,12 +48,12 @@ jobs:
cabal install --install-method=copy --installdir=bin
ldd bin/pboy || otool -L bin/pboy || true
- name: Compress binaries
uses: svenstaro/upx-action@v2
with:
file: bin/pboy
args: --best
strip: true
# - name: Compress binaries
# uses: svenstaro/upx-action@v2
# with:
# file: bin/pboy
# args: --best
# strip: true

- name: Prepare Publishing
if: startsWith(github.ref, 'refs/tags/')
Expand Down
3 changes: 3 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Changelog

1.6, 2021-04-20
- build and CI fixes

1.5, 2021-01-19
- fix the binary compression to work on MacOS Big Sur.

Expand Down
2 changes: 1 addition & 1 deletion pboy.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.0

name: pboy
version: 1.5
version: 1.6
synopsis: a small .pdf management utility
description: Please see the README on Github at <https://github.com/2mol/pboy#readme>
homepage: https://github.com/2mol/pboy#readme
Expand Down
2 changes: 1 addition & 1 deletion pboy.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let
pboy = haskellPackages.callCabal2nix "pboy" (lib.cleanSource ./.) {};
in
symlinkJoin {
name = "pboy-1.5";
name = "pboy-1.6";
buildInputs = [makeWrapper];
postBuild = ''
wrapProgram "$out/bin/pboy" \
Expand Down

0 comments on commit 0b1c224

Please sign in to comment.