diff --git a/.github/workflows/binaries-mac-arm64.yml b/.github/workflows/binaries-mac-arm64.yml index 11e195f53..b1cba70b1 100644 --- a/.github/workflows/binaries-mac-arm64.yml +++ b/.github/workflows/binaries-mac-arm64.yml @@ -18,18 +18,26 @@ on: jobs: build: + # arm64 runs-on: macos-latest - strategy: - fail-fast: false - matrix: - plan: - # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } - # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) - # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } - # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } - # - { ghc: "94" , stack: "stack --stack-yaml=stack9.4.yaml" } - # - { ghc: "96" , stack: "stack --stack-yaml=stack9.6.yaml" } - - { ghc: "98" , stack: "stack --stack-yaml=stack.yaml" } + + # strategy: + # fail-fast: false + # matrix: + # plan: + # # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } + # # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) + # # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } + # # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } + # # - { ghc: "94" , stack: "stack --stack-yaml=stack9.4.yaml" } + # # - { ghc: "96" , stack: "stack --stack-yaml=stack9.6.yaml" } + # - { ghc: "98" , stack: "stack --stack-yaml=stack.yaml" } + + env: + ghc: 98 + stack: stack + # declare this to prevent "Context access might be invalid" warnings below + CONTINUE: steps: @@ -120,8 +128,6 @@ jobs: stack --version - name: Install GHC (with stack) - env: - stack: ${{ matrix.plan.stack }} run: | $stack setup --install-ghc @@ -132,31 +138,23 @@ jobs: # echo "$HOME/.ghcup/bin/" >> $GITHUB_PATH - name: Install haskell deps - env: - stack: ${{ matrix.plan.stack }} run: | $stack build --test --only-dependencies --dry-run $stack build --test --only-dependencies - name: Build hledger and test unit tests, doc tests - env: - stack: ${{ matrix.plan.stack }} run: | $stack install --test --force-dirty --ghc-options=-fforce-recomp --ghc-options=-Werror # --ghc-options=-split-sections doesn't work on mac # --pedantic - name: Install shelltestrunner - env: - stack: ${{ matrix.plan.stack }} run: | export PATH=~/.local/bin:$PATH if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install shelltestrunner-1.10; fi shelltest --version - name: Test functional tests (excluding addons) - env: - stack: ${{ matrix.plan.stack }} run: | export PATH=~/.local/bin:$PATH COLUMNS=80 $stack exec -- shelltest --execdir -j16 hledger/test -x /_ -x /addons -x ledger-compat/ledger-baseline -x ledger-compat/ledger-regress -x ledger-compat/ledger-collected # bin @@ -164,8 +162,6 @@ jobs: # This is tested here rather than in the regular CI because it's slow, # doesn't fail too often, and the cost of late detection and fixing is low. - name: Test haddock generation - env: - stack: ${{ matrix.plan.stack }} run: | printf "haddock: "; stack exec -- haddock --version time $stack build --fast --haddock --no-haddock-deps --no-haddock-hyperlink-source --haddock-arguments="--no-print-missing-docs" diff --git a/.github/workflows/binaries-mac-x64.yml b/.github/workflows/binaries-mac-x64.yml index 2930fa6a1..e205c8c0b 100644 --- a/.github/workflows/binaries-mac-x64.yml +++ b/.github/workflows/binaries-mac-x64.yml @@ -18,18 +18,26 @@ on: jobs: build: + # x64 runs-on: macos-13 - strategy: - fail-fast: false - matrix: - plan: - # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } - # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) - # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } - # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } - # - { ghc: "94" , stack: "stack --stack-yaml=stack9.4.yaml" } - # - { ghc: "96" , stack: "stack --stack-yaml=stack9.6.yaml" } - - { ghc: "98" , stack: "stack --stack-yaml=stack.yaml" } + + # strategy: + # fail-fast: false + # matrix: + # plan: + # # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } + # # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) + # # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } + # # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } + # # - { ghc: "94" , stack: "stack --stack-yaml=stack9.4.yaml" } + # # - { ghc: "96" , stack: "stack --stack-yaml=stack9.6.yaml" } + # - { ghc: "98" , stack: "stack --stack-yaml=stack.yaml" } + + env: + ghc: 944 + stack: stack --stack-yaml=stack9.4.yaml + # declare this to prevent "Context access might be invalid" warnings below + CONTINUE: steps: @@ -115,8 +123,6 @@ jobs: #if [[ ! -x ~/.ghcup/bin/ghc-9.8.2 ]]; then ~/.ghcup/bin/ghcup install ghc 9.8.2 && ~/.ghcup/bin/ghcup set ghc 9.8.2; fi; printf "ghc: "; ghc --version - name: Install GHC with stack - env: - stack: ${{ matrix.plan.stack }} run: | $stack setup --install-ghc @@ -127,31 +133,23 @@ jobs: # echo "$HOME/.ghcup/bin/" >> $GITHUB_PATH - name: Install haskell deps - env: - stack: ${{ matrix.plan.stack }} run: | $stack build --test --only-dependencies --dry-run $stack build --test --only-dependencies - name: Build hledger and test unit tests, doc tests - env: - stack: ${{ matrix.plan.stack }} run: | $stack install --test --force-dirty --ghc-options=-fforce-recomp --ghc-options=-Werror # --ghc-options=-split-sections doesn't work on mac # --pedantic - name: Install shelltestrunner - env: - stack: ${{ matrix.plan.stack }} run: | export PATH=~/.local/bin:$PATH if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install shelltestrunner-1.10; fi shelltest --version - name: Test functional tests (excluding addons) - env: - stack: ${{ matrix.plan.stack }} run: | export PATH=~/.local/bin:$PATH COLUMNS=80 $stack exec -- shelltest --execdir -j16 hledger/test -x /_ -x /addons -x ledger-compat/ledger-baseline -x ledger-compat/ledger-regress -x ledger-compat/ledger-collected # bin