From 71a9992738a2d4c075c25ecb4378c8a67c6fa780 Mon Sep 17 00:00:00 2001 From: thomasjm Date: Mon, 28 Oct 2024 15:16:11 -0700 Subject: [PATCH] ci: fix cabal.project --- .github/workflows/sandwich.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sandwich.yml b/.github/workflows/sandwich.yml index c5fd677c..5a059ee5 100644 --- a/.github/workflows/sandwich.yml +++ b/.github/workflows/sandwich.yml @@ -42,15 +42,20 @@ jobs: "$env:PGBIN" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append # Disable demo-postgres since it requires unix sockets - sed -i 's/demos\/demo-postgres/-- demos\/demo-postgres/g' cabal.project + sed -i 's|, ./demos/demo-postgres|-- , ./demos/demo-postgres|g' cabal.project + cat cabal.project # Because the HaskellNet dependency doesn't work yet with GHC 9.8 - name: Disable demo-fake-smtp-server for GHC 9.8.x if: ${{ matrix.ghc == '9.8.2' && runner.os == 'macOS' }} - run: sed -i '.bak' 's/demos\/demo-fake-smtp-server/-- demos\/demo-fake-smtp-server/g' cabal.project + run: | + sed -i '.bak' 's|, ./demos/demo-fake-smtp-server|--, ./demos/demo-fake-smtp-server|g' cabal.project + cat cabal.project - name: Disable demo-fake-smtp-server for GHC 9.8.x if: ${{ matrix.ghc == '9.8.2' && runner.os != 'macOS' }} - run: sed -i 's/demos\/demo-fake-smtp-server/-- demos\/demo-fake-smtp-server/g' cabal.project + run: | + sed -i 's|, ./demos/demo-fake-smtp-server|-- , ./demos/demo-fake-smtp-server|g' cabal.project + cat cabal.project - uses: haskell-actions/setup@v2 id: setup-haskell-cabal