Skip to content

Commit 3322046

Browse files
authored
Merge pull request #507 from haskell/ddump-timing-CPP
Workaround for overwriting of .ddump-timing in tests
2 parents e6660a7 + 76a2468 commit 3322046

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818
matrix:
1919
include:
2020
# Linux
21-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.0.2" }
22-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.2.2" }
23-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.4.4" }
24-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.6.5" }
25-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.8.4" }
26-
- { cabal: "3.10", os: ubuntu-latest, ghc: "8.10.7" }
27-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.0.2" }
28-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.2.8" }
29-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.4.8" }
30-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.6.5" }
31-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.6.5",
21+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.0.2" }
22+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.2.2" }
23+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.4.4" }
24+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.6.5" }
25+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.8.4" }
26+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.10.7" }
27+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.0.2" }
28+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.2.8" }
29+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.4.8" }
30+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.6.5" }
31+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.6.5",
3232
flags: "-fUnsafeChecks -fInternalChecks" }
33-
- { cabal: "3.10", os: ubuntu-latest, ghc: "9.8.2" }
33+
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.8.2" }
3434
# Win
3535
- { cabal: "3.10", os: windows-latest, ghc: "8.4.4" }
3636
# OOM when building tests
@@ -73,7 +73,7 @@ jobs:
7373
run: |
7474
sudo apt-get install -y libpapi-dev
7575
echo FLAG_PAPI=-fBenchPAPI >> "$GITHUB_ENV"
76-
if: matrix.os == 'ubuntu-latest'
76+
if: matrix.os == 'ubuntu-22.04'
7777
# ----------------
7878
- name: Versions
7979
run: |

vector/tests/Utilities.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DefaultSignatures #-}
23
{-# LANGUAGE FlexibleInstances #-}
34
{-# LANGUAGE GADTs #-}

vector/vector.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ common tests-common
208208
Tests.Vector.UnitTests
209209
Utilities
210210

211-
default-extensions: CPP,
211+
default-extensions:
212212
ScopedTypeVariables,
213213
PatternGuards,
214214
MultiParamTypeClasses,

0 commit comments

Comments
 (0)