diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5d1f22287..c3310d898 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -193,7 +193,7 @@ jobs: - name: Build hledger quickly warning free, run unit tests, run doc tests run: | - stack $ARGS build --test --bench --fast --ghc-options=-Werror --no-terminal + stack $ARGS install --test --bench --fast --ghc-options=-Werror --no-terminal # --pedantic --no-run-benchmarks env: ARGS: ${{ matrix.plan.args }} @@ -221,25 +221,27 @@ jobs: env: ARGS: ${{ matrix.plan.args }} + # artifacts: + - name: Gather executables run: | mkdir tmp cd tmp mkdir hledger cd hledger - cp `stack $ARGS exec -- which hledger` . - cp `stack $ARGS exec -- which hledger-ui` . - cp `stack $ARGS exec -- which hledger-web` . + cp ~/.local/bin/hledger . + cp ~/.local/bin/hledger-ui . + cp ~/.local/bin/hledger-web . - - name: Create executables artifact + - name: Upload executables artifact uses: actions/upload-artifact@v2 with: - name: hledger-linux + name: hledger-ubuntu path: tmp/hledger - # - name: show stuff - # run: | - # if [[ -e ~/.stack ]]; then ls -lFRa ~/.stack; fi + + + # - name: show stuff # run: | diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index efc8bbc33..50823c26f 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -116,7 +116,7 @@ jobs: - name: Build hledger and test unit tests, doc tests run: | - stack build --test --ghc-options=-Werror + stack install --test --ghc-options=-Werror # --pedantic - name: Install shelltestrunner @@ -130,18 +130,20 @@ jobs: export PATH=~/.local/bin:$PATH COLUMNS=80 stack exec -- shelltest --execdir -j16 tests -x /bin -x /addons + # artifacts: + - name: Gather executables run: | mkdir tmp cd tmp mkdir hledger cd hledger - cp `stack exec -- which hledger` . - cp `stack exec -- which hledger-ui` . - cp `stack exec -- which hledger-web` . + cp ~/.local/bin/hledger . + cp ~/.local/bin/hledger-ui . + cp ~/.local/bin/hledger-web . - - name: Create executables artifact + - name: Upload executables artifact uses: actions/upload-artifact@v2 with: - name: hledger-mac + name: hledger-macos path: tmp/hledger diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3ff6ad792..25feca237 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -148,14 +148,7 @@ jobs: ## - export PATH=~/.local/bin:$PATH #- COLUMNS=80 stack exec -- shelltest --execdir -j16 tests -x /bin -x /addons - # - name: Zip executables - # #cd `stack path --local-bin` - # run: | - # cd C:\Users\runneradmin\AppData\Roaming\local\bin\ - # 7z a D:\a\hledger\hledger\hledger.zip hledger.exe hledger-web.exe - - # github automatically zips every artifact, though it's not - # apparent in the displayed link text and file size + # artifacts: - name: Gather executables run: | @@ -169,5 +162,6 @@ jobs: - name: Create executables artifact uses: actions/upload-artifact@v2 with: - name: hledger-win + name: hledger-windows path: tmp/hledger +