diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml index c1581d5..cd29b5c 100644 --- a/.github/workflows/cabal.yml +++ b/.github/workflows/cabal.yml @@ -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 @@ -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/') diff --git a/Changelog.txt b/Changelog.txt index f62d887..31fe8e7 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -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. diff --git a/pboy.cabal b/pboy.cabal index 42ea402..0d52991 100644 --- a/pboy.cabal +++ b/pboy.cabal @@ -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 homepage: https://github.com/2mol/pboy#readme diff --git a/pboy.nix b/pboy.nix index ff5fcec..5cdcc7f 100644 --- a/pboy.nix +++ b/pboy.nix @@ -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" \