From 4499144a4dedd5d568878e75fa8d82261c2c374d Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Tue, 29 Jul 2025 08:06:41 +0200 Subject: [PATCH] test more builds --- .github/workflows/build.yml | 25 +++++++++++++++++-------- werge.cabal | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c38d5e..4342ea0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,17 +8,26 @@ on: jobs: build: - runs-on: ubuntu-latest + name: Build ${{ github.ref_name }} OS:${{ matrix.os }} GHC:${{ matrix.ghc }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-22.04, macos-15] + ghc: + - "9.6" + - "9.12" steps: - uses: actions/checkout@v4 - with: - submodules: recursive - uses: haskell-actions/setup@v2 with: - ghc-version: '9.4' - - run: | - cabal build - xz -9 < `cabal exec which werge` > werge-${{ github.ref_name }}-`uname -m`.xz + ghc-version: ${{ matrix.ghc }} + - name: build + run: | + mkdir dist + cabal install exe:werge --install-method=copy --overwrite-policy=always --installdir=dist + strip dist/werge + mv dist/werge dist/werge-${{ github.ref_name }}_${{ matrix.os }}_ghc-${{ matrix.ghc }} + xz dist/werge-* - uses: softprops/action-gh-release@v2 with: - files: werge-*.xz + files: dist/werge-*.xz diff --git a/werge.cabal b/werge.cabal index f8b8c84..0782b46 100644 --- a/werge.cabal +++ b/werge.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: werge -version: 0.1.0.0 +version: 0.2.0.0 synopsis: mergetool for mangled-up bite-size changes license: GPL-3.0-or-later license-file: LICENSE