Skip to content

Commit 540adca

Browse files
committed
Fix build directory for documentation
1 parent 5d91dd7 commit 540adca

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
runs-on: ${{ matrix.os }}-latest
5757
env:
5858
# Use short builddir on Windows to avoid MAX_PATH (260 char) limitations
59-
BUILDDIR: ${{ matrix.os == 'windows' && '--builddir=C:/b' || '' }}
59+
BUILDDIR: ${{ runner.os == 'Windows' && 'C:/b' || 'dist-newstyle' }}
6060
DOCUMENTATION: ${{ matrix.documentation && '--enable-documentation --haddock-for-hackage' || '' }}
61-
WINDOWS_FLAGS: ${{ matrix.os == 'windows' && '--constraint="postgresql-libpq +use-pkg-config"' || '' }}
61+
WINDOWS_FLAGS: ${{ runner.os == 'Windows' && '--constraint="postgresql-libpq +use-pkg-config"' || '' }}
6262
steps:
6363
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6464
- run: mkdir artifact
@@ -101,9 +101,9 @@ jobs:
101101
path: |
102102
${{ runner.os == 'Windows' && '~\AppData\Roaming\cabal' || '~/.local/state/cabal' }}
103103
restore-keys: ${{ matrix.os }}-${{ matrix.ghc }}-
104-
- run: cabal $BUILDDIR build --only-download
105-
- run: cabal $BUILDDIR build --only-dependencies
106-
- run: cabal $BUILDDIR build
104+
- run: cabal --builddir=$BUILDDIR build --only-download
105+
- run: cabal --builddir=$BUILDDIR build --only-dependencies
106+
- run: cabal --builddir=$BUILDDIR build
107107
- if: ${{ matrix.documentation }}
108108
run: cp $BUILDDIR/${{ needs.meta.outputs.name }}-${{ needs.meta.outputs.version }}-docs.tar.gz artifact
109109
- run: tar --create --file artifact.tar --verbose artifact
@@ -113,68 +113,68 @@ jobs:
113113
path: artifact.tar
114114
- env:
115115
PGPASSWORD: postgres
116-
run: cabal $BUILDDIR run -- postgresql-simple-interval-test-suite --randomize
116+
run: cabal --builddir=$BUILDDIR run -- postgresql-simple-interval-test-suite --randomize
117117
strategy:
118118
matrix:
119119
include:
120120
- documentation: false
121-
ghc: "9.12"
121+
ghc: '9.12'
122122
postgres: 17
123123
os: macos
124124
- documentation: false
125-
ghc: "8.8"
125+
ghc: '8.8'
126126
postgres: 17
127127
os: ubuntu
128128
- documentation: false
129-
ghc: "8.10"
129+
ghc: '8.10'
130130
postgres: 17
131131
os: ubuntu
132132
- documentation: false
133-
ghc: "9.0"
133+
ghc: '9.0'
134134
postgres: 17
135135
os: ubuntu
136136
- documentation: false
137-
ghc: "9.2"
137+
ghc: '9.2'
138138
postgres: 17
139139
os: ubuntu
140140
- documentation: false
141-
ghc: "9.4"
141+
ghc: '9.4'
142142
postgres: 17
143143
os: ubuntu
144144
- documentation: false
145-
ghc: "9.6"
145+
ghc: '9.6'
146146
postgres: 17
147147
os: ubuntu
148148
- documentation: false
149-
ghc: "9.8"
149+
ghc: '9.8'
150150
postgres: 17
151151
os: ubuntu
152152
- documentation: false
153-
ghc: "9.10"
153+
ghc: '9.10'
154154
postgres: 17
155155
os: ubuntu
156156
- documentation: false
157-
ghc: "9.12"
157+
ghc: '9.12'
158158
postgres: 14
159159
os: ubuntu
160160
- documentation: false
161-
ghc: "9.12"
161+
ghc: '9.12'
162162
postgres: 15
163163
os: ubuntu
164164
- documentation: false
165-
ghc: "9.12"
165+
ghc: '9.12'
166166
postgres: 16
167167
os: ubuntu
168168
- documentation: true
169-
ghc: "9.12"
169+
ghc: '9.12'
170170
postgres: 17
171171
os: ubuntu
172172
- documentation: false
173-
ghc: "9.14"
173+
ghc: '9.14'
174174
postgres: 17
175175
os: ubuntu
176176
- documentation: false
177-
ghc: "9.12"
177+
ghc: '9.12'
178178
postgres: 17
179179
os: windows
180180
release:

0 commit comments

Comments
 (0)