Skip to content

Commit cf2bb5f

Browse files
phadejphadej
authored
Merge pull request #483 from haskell-CI/gha-cabal-version
Use config cabal version in GHA
2 parents 4fd29ae + 2931b8b commit cf2bb5f

File tree

11 files changed

+25
-22
lines changed

11 files changed

+25
-22
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
7474
apt-add-repository -y 'ppa:hvr/ghc'
7575
apt-get update
76-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
76+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
7777
env:
7878
GHC_VERSION: ${{ matrix.ghc }}
7979
- name: Set PATH and environment variables
@@ -86,7 +86,7 @@ jobs:
8686
echo "HC=$HC" >> $GITHUB_ENV
8787
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
8888
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
89-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
89+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
9090
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
9191
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
9292
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/all-versions.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
115115
apt-add-repository -y 'ppa:hvr/ghc'
116116
apt-get update
117-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
117+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
118118
env:
119119
GHC_VERSION: ${{ matrix.ghc }}
120120
- name: Set PATH and environment variables
@@ -127,7 +127,7 @@ jobs:
127127
echo "HC=$HC" >> $GITHUB_ENV
128128
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
129129
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
130-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
130+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
131131
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
132132
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
133133
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/copy-fields-all.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9191
apt-add-repository -y 'ppa:hvr/ghc'
9292
apt-get update
93-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
93+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
9494
env:
9595
GHC_VERSION: ${{ matrix.ghc }}
9696
- name: Set PATH and environment variables
@@ -103,7 +103,7 @@ jobs:
103103
echo "HC=$HC" >> $GITHUB_ENV
104104
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
105105
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
106-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
106+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
107107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
108108
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/copy-fields-none.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9191
apt-add-repository -y 'ppa:hvr/ghc'
9292
apt-get update
93-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
93+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
9494
env:
9595
GHC_VERSION: ${{ matrix.ghc }}
9696
- name: Set PATH and environment variables
@@ -103,7 +103,7 @@ jobs:
103103
echo "HC=$HC" >> $GITHUB_ENV
104104
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
105105
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
106-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
106+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
107107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
108108
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/copy-fields-some.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9191
apt-add-repository -y 'ppa:hvr/ghc'
9292
apt-get update
93-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
93+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
9494
env:
9595
GHC_VERSION: ${{ matrix.ghc }}
9696
- name: Set PATH and environment variables
@@ -103,7 +103,7 @@ jobs:
103103
echo "HC=$HC" >> $GITHUB_ENV
104104
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
105105
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
106-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
106+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
107107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
108108
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/empty-line.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9191
apt-add-repository -y 'ppa:hvr/ghc'
9292
apt-get update
93-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
93+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
9494
env:
9595
GHC_VERSION: ${{ matrix.ghc }}
9696
- name: Set PATH and environment variables
@@ -103,7 +103,7 @@ jobs:
103103
echo "HC=$HC" >> $GITHUB_ENV
104104
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
105105
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
106-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
106+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
107107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
108108
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/irc-channels.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
116116
apt-add-repository -y 'ppa:hvr/ghc'
117117
apt-get update
118-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
118+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
119119
env:
120120
GHC_VERSION: ${{ matrix.ghc }}
121121
- name: Set PATH and environment variables
@@ -128,7 +128,7 @@ jobs:
128128
echo "HC=$HC" >> $GITHUB_ENV
129129
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
130130
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
131-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
131+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
132132
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
133133
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
134134
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/messy.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9191
apt-add-repository -y 'ppa:hvr/ghc'
9292
apt-get update
93-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2 fftw3-dev
93+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4 fftw3-dev
9494
env:
9595
GHC_VERSION: ${{ matrix.ghc }}
9696
- name: Set PATH and environment variables
@@ -103,7 +103,7 @@ jobs:
103103
echo "HC=$HC" >> $GITHUB_ENV
104104
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
105105
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
106-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
106+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
107107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
108108
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/psql.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9797
apt-add-repository -y 'ppa:hvr/ghc'
9898
apt-get update
99-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
99+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
100100
env:
101101
GHC_VERSION: ${{ matrix.ghc }}
102102
- name: Set PATH and environment variables
@@ -109,7 +109,7 @@ jobs:
109109
echo "HC=$HC" >> $GITHUB_ENV
110110
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
111111
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
112-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
112+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
113113
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
114114
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
115115
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

‎fixtures/travis-patch.github‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
9191
apt-add-repository -y 'ppa:hvr/ghc'
9292
apt-get update
93-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
93+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
9494
env:
9595
GHC_VERSION: ${{ matrix.ghc }}
9696
- name: Set PATH and environment variables
@@ -103,7 +103,7 @@ jobs:
103103
echo "HC=$HC" >> $GITHUB_ENV
104104
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
105105
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
106-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
106+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
107107
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
108108
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

0 commit comments

Comments
 (0)