Skip to content

Commit 2a49a4e

Browse files
committed
ci: we don't actually need postgresql-simple on Windows
1 parent 2ad5045 commit 2a49a4e

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

.github/workflows/sandwich.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,6 @@ jobs:
100100
run: |
101101
"$env:PGBIN" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
102102
103-
# Install alternative pkgconf to make postgresql-libpq-configure work
104-
vcpkg install pkgconf:x64-windows
105-
$pkgconfPath = "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\tools\pkgconf"
106-
Copy-Item "$pkgconfPath\pkgconf.exe" "$pkgconfPath\pkg-config.exe"
107-
# Prepend to PATH so it's found before Strawberry Perl's version
108-
echo "$pkgconfPath" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
109-
110103
- name: Install dependencies (macOS)
111104
if: runner.os == 'macOS'
112105
run: |

sandwich-contexts/package.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,11 @@ tests:
8787
- -threaded
8888
dependencies:
8989
- filepath
90-
- postgresql-simple
9190
- relude
9291
- sandwich-contexts
9392
- string-interpolate
9493
build-tools: sandwich:sandwich-discover
94+
when:
95+
- condition: "!os(windows)"
96+
dependencies:
97+
- postgresql-simple

sandwich-contexts/sandwich-contexts.cabal

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.38.0.
3+
-- This file has been generated from package.yaml by hpack version 0.38.1.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -115,10 +115,12 @@ test-suite tests
115115
build-depends:
116116
base >=4.11 && <5
117117
, filepath
118-
, postgresql-simple
119118
, relude
120119
, sandwich >=0.3.0.0
121120
, sandwich-contexts
122121
, string-interpolate
123122
, unliftio
124123
default-language: Haskell2010
124+
if !os(windows)
125+
build-depends:
126+
postgresql-simple

0 commit comments

Comments
 (0)