From a088017dba7e9d7f33df6fdb250c10a54d8d2b2d Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2021 22:25:16 +0000 Subject: [PATCH] add tidal ghci replacement to macos and windows workflows --- .github/workflows/listener-build-macosx.yml | 7 +++++-- .github/workflows/listener-build-windows.yml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/listener-build-macosx.yml b/.github/workflows/listener-build-macosx.yml index 8ffa2f0d2..f84c73981 100644 --- a/.github/workflows/listener-build-macosx.yml +++ b/.github/workflows/listener-build-macosx.yml @@ -39,6 +39,7 @@ jobs: run: | cabal update cabal build --enable-tests tidal-listener + cabal build - name: move GHC libs and configs run: | @@ -97,8 +98,10 @@ jobs: sed -i '' 's+gcc+$topdir/bin/fake_gcc.sh+g' tidal-listener/binary/haskell-libs/settings chmod 755 tidal-listener/binary/haskell-libs/bin/fake_gcc.sh - - name: move executable - run: cp -r dist-newstyle/build/x86_64-osx/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener + - name: move executables + run: | + cp -r dist-newstyle/build/x86_64-osx/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener + cp -r dist-newstyle/build/x86_64-osx/ghc-${{ matrix.ghc }}/tidal-1.7.10/x/tidal/build/tidal/tidal tidal-listener/binary/tidal - name: zip files run: | diff --git a/.github/workflows/listener-build-windows.yml b/.github/workflows/listener-build-windows.yml index 85a57cc4a..a5c4b95dd 100644 --- a/.github/workflows/listener-build-windows.yml +++ b/.github/workflows/listener-build-windows.yml @@ -39,6 +39,7 @@ jobs: run: | cabal update cabal build --enable-tests tidal-listener + cabal build - name: remove unneccessary libs run: | @@ -78,8 +79,10 @@ jobs: ghc-pkg -v2 recache --package-db="tidal-listener\binary\haskell-libs\package.conf.d" ghc-pkg -v2 recache --package-db="tidal-listener\binary\haskell-libs\package.db" - - name: move executable - run: Copy-Item -Path 'dist-newstyle\build\x86_64-windows\ghc-${{ matrix.ghc }}\tidal-listener-0.1.0.0\x\tidal-listener\build\tidal-listener\tidal-listener.exe' -Recurse -Destination 'tidal-listener\binary\tidal-listener.exe' + - name: move executables + run: | + Copy-Item -Path 'dist-newstyle\build\x86_64-windows\ghc-${{ matrix.ghc }}\tidal-listener-0.1.0.0\x\tidal-listener\build\tidal-listener\tidal-listener.exe' -Recurse -Destination 'tidal-listener\binary\tidal-listener.exe' + Copy-Item -Path 'dist-newstyle\build\x86_64-windows\ghc-${{ matrix.ghc }}\tidal-1.7.10\x\tidal\build\tidal\tidal.exe' -Recurse -Destination 'tidal-listener\binary\tidal.exe' - name: zip files run: Compress-Archive -LiteralPath 'tidal-listener\binary\' -DestinationPath 'tidal-listener\windows.zip'