Skip to content

Commit

Permalink
Fix emulated jobs + use ghcup on FreeBSD
Browse files Browse the repository at this point in the history
  • Loading branch information
Bodigrim committed Oct 26, 2024
1 parent ee0a8f8 commit 1982c05
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ task:
name: FreeBSD
freebsd_instance:
image_family: freebsd-14-0
# See https://github.com/haskell/text/pull/475#issuecomment-1272359694
install_script:
- sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
- pkg install -y ghc hs-cabal-install git llvm14
- pkg install -y git gmake
- curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh
script:
- cabal update
- cabal test --test-show-details=direct --ghc-options='-pgmc clang++14'
- export PATH="$HOME/.ghcup/bin:$PATH"
- cabal test --test-show-details=direct

task:
name: OpenBSD
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/emulated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
arch: ['s390x', 'ppc64le']
steps:
- uses: actions/checkout@v4
- uses: uraimo/run-on-arch-action@v2.5.0
- uses: uraimo/run-on-arch-action@v2.8.1
timeout-minutes: 60
with:
arch: ${{ matrix.arch }}
Expand Down

0 comments on commit 1982c05

Please sign in to comment.