c704151 · typeable/uuid

git.iko.soy/typeable/uuid

on master help sign in

Merge pull request #90 from haskell-hvr/ghc-9.12

c704151Oleg Grenrus2 years ago

.github/workflows/haskell-ci.yml+27−17

compare with master

unifiedsplit

@@ -8,9 +8,9 @@

9# For more information, see https://github.com/haskell-CI/haskell-ci

10#

11−# version: 0.19.20240702

11+# version: 0.19.20241223

12#

13−# REGENDATA ("0.19.20240702",["github","cabal.project"])

13+# REGENDATA ("0.19.20241223",["github","cabal.project"])

14#

15name: Haskell-CI

16on:

@@ -32,14 +32,19 @@ jobs:

32 strategy:

33 matrix:

34 include:

35+ - compiler: ghc-9.12.1

36+ compilerKind: ghc

37+ compilerVersion: 9.12.1

38+ setup-method: ghcup

39+ allow-failure: false

35 - compiler: ghc-9.10.1

40 - compiler: ghc-9.10.1

36 compilerKind: ghc

41 compilerKind: ghc

37 compilerVersion: 9.10.1

42 compilerVersion: 9.10.1

38 setup-method: ghcup

43 setup-method: ghcup

39 allow-failure: false

44 allow-failure: false

40− - compiler: ghc-9.8.2

45+ - compiler: ghc-9.8.4

41 compilerKind: ghc

46 compilerKind: ghc

42− compilerVersion: 9.8.2

47+ compilerVersion: 9.8.4

43 setup-method: ghcup

48 setup-method: ghcup

44 allow-failure: false

49 allow-failure: false

45 - compiler: ghc-9.6.6

50 - compiler: ghc-9.6.6

@@ -79,15 +84,29 @@ jobs:

79 allow-failure: false

84 allow-failure: false

80 fail-fast: false

85 fail-fast: false

81 steps:

86 steps:

82− - name: apt

87+ - name: apt-get install

83 run: |

88 run: |

84 apt-get update

89 apt-get update

85 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

90 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

91+ - name: Install GHCup

92+ run: |

86 mkdir -p "$HOME/.ghcup/bin"

93 mkdir -p "$HOME/.ghcup/bin"

87− curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"

94+ curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"

88 chmod a+x "$HOME/.ghcup/bin/ghcup"

95 chmod a+x "$HOME/.ghcup/bin/ghcup"

96+ - name: Install cabal-install

97+ run: |

98+ "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

99+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"

100+ - name: Install GHC (GHCup)

101+ if: matrix.setup-method == 'ghcup'

102+ run: |

89 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

103 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

90− "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

104+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")

105+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')

106+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

107+ echo "HC=$HC" >> "$GITHUB_ENV"

108+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"

109+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"

91 env:

110 env:

92 HCKIND: ${{ matrix.compilerKind }}

111 HCKIND: ${{ matrix.compilerKind }}

93 HCNAME: ${{ matrix.compiler }}

112 HCNAME: ${{ matrix.compiler }}

@@ -98,21 +117,12 @@ jobs:

98 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

117 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

99 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

118 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

100 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

119 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

101− HCDIR=/opt/$HCKIND/$HCVER

102− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")

103− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')

104− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

105− echo "HC=$HC" >> "$GITHUB_ENV"

106− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"

107− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"

108− echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"

109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

120 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

121 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

111 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

122 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

112 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

123 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

113 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

124 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

114 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

125 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

115− echo "GHCJSARITH=0" >> "$GITHUB_ENV"

116 env:

126 env:

117 HCKIND: ${{ matrix.compilerKind }}

127 HCKIND: ${{ matrix.compilerKind }}

118 HCNAME: ${{ matrix.compiler }}

128 HCNAME: ${{ matrix.compiler }}

@@ -245,8 +255,8 @@ jobs:

245 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all

255 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all

246 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all

256 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all

247 - name: save cache

257 - name: save cache

248− uses: actions/cache/save@v4

249 if: always()

258 if: always()

259+ uses: actions/cache/save@v4

250 with:

260 with:

251 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

261 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

252 path: ~/.cabal/store

262 path: ~/.cabal/store

uuid-types/uuid-types.cabal+4−3

@@ -1,7 +1,7 @@

1cabal-version: 1.12

2name: uuid-types

3version: 1.0.6

4−x-revision: 1

4+x-revision: 2

5copyright:

@@ -20,8 +20,9 @@ tested-with:

20 || ==9.2.8

21 || ==9.4.8

22 || ==9.6.6

23− || ==9.8.2

23+ || ==9.8.4

24 || ==9.10.1

25+ || ==9.12.1

26synopsis: Type definitions for Universally Unique Identifiers

27synopsis: Type definitions for Universally Unique Identifiers

27description:

28description:

@@ -51,7 +52,7 @@ library

51 , deepseq >=1.4.4.0 && <1.6

52 , deepseq >=1.4.4.0 && <1.6

52 , hashable >=1.4.4.0 && <1.6

53 , hashable >=1.4.4.0 && <1.6

53 , random >=1.2.1.2 && <1.3

54 , random >=1.2.1.2 && <1.3

54− , template-haskell >=2.14.0.0 && <2.23

55+ , template-haskell >=2.14.0.0 && <2.24

55 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

56 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

57 exposed-modules: Data.UUID.Types

58 exposed-modules: Data.UUID.Types

uuid/uuid.cabal+4−3

@@ -1,7 +1,7 @@

1cabal-version: 1.12

2name: uuid

3version: 1.3.16

4−x-revision: 1

4+x-revision: 2

6author: Antoine Latter

7maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

@@ -17,8 +17,9 @@ tested-with:

17 || ==9.2.8

18 || ==9.4.8

19 || ==9.6.6

20− || ==9.8.2

20+ || ==9.8.4

21 || ==9.10.1

22+ || ==9.12.1

23synopsis:

24synopsis:

24 For creating, comparing, parsing and printing Universally Unique Identifiers

25 For creating, comparing, parsing and printing Universally Unique Identifiers

@@ -49,7 +50,7 @@ library

49 , network-info >=0.2 && <0.3

50 , network-info >=0.2 && <0.3

50 , random >=1.2.1.2 && <1.3

51 , random >=1.2.1.2 && <1.3

51 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

52 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

52− , time >=1.4 && <1.13

53+ , time >=1.4 && <1.15

54 -- strict dependency on uuid-types,

55 -- strict dependency on uuid-types,

55 -- as we re-rexport datatype, thus leak instances etc.

56 -- as we re-rexport datatype, thus leak instances etc.