e6e96bc · stackage · git.iko.soy

git.iko.soy/stackage

Merge remote-tracking branch 'origin/master' into nightly

commite6e96bc93255da4570a9ba742aed35a31ce924bb authorAdam Bergmark <adam@bergmark.nl> dateThu 17 Jun 2021, 12:22 (5 years ago) parent08cd4f8 b1305cd

2 files changed+8−9

unifiedsplit

.github/workflows/check.yml−4

@@ -6,10 +6,6 @@ jobs:

66 name: Stackage check

77 steps:

88 - uses: actions/checkout@v2

9− - uses: haskell/actions/setup@v1

10− with:

11− ghc-version: '8.10'

12− stack-version: '2.5'

139 - uses: actions/cache@v2

1410 with:

1511 path: |

debian-bootstrap.sh+8−5

@@ -176,10 +176,13 @@ apt-get install -y \

176176 zsh

177177

178178# odbc

179−curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -

180−curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list

181−apt-get update

182−ACCEPT_EULA=Y apt-get install msodbcsql17 -y

179+# TODO: See if we can fix this...

180+# E: Failed to fetch https://packages.microsoft.com/debian/9/prod/pool/main/u/unixodbc/odbcinst_2.3.7_amd64.deb 404 Not Found

181+#

182+# curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -

183+# curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list

184+# apt-get update

185+# ACCEPT_EULA=Y apt-get install msodbcsql17 -y

183186

184187# llvm for llvm-hs

185188curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -

@@ -331,7 +334,7 @@ pushd /tmp \

331334 && make \

332335 && sudo make install \

333336 && popd \

334− && popd

337+ && popd

335338)

336339

337340