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

This commit is contained in:
Adam Bergmark 2021-06-17 12:22:54 +02:00
commit e6e96bc932
2 changed files with 8 additions and 9 deletions

View File

@ -6,10 +6,6 @@ jobs:
name: Stackage check name: Stackage check
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: haskell/actions/setup@v1
with:
ghc-version: '8.10'
stack-version: '2.5'
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: | path: |

View File

@ -176,10 +176,13 @@ apt-get install -y \
zsh zsh
# odbc # odbc
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - # TODO: See if we can fix this...
curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list # E: Failed to fetch https://packages.microsoft.com/debian/9/prod/pool/main/u/unixodbc/odbcinst_2.3.7_amd64.deb 404 Not Found
apt-get update #
ACCEPT_EULA=Y apt-get install msodbcsql17 -y # curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
# curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list
# apt-get update
# ACCEPT_EULA=Y apt-get install msodbcsql17 -y
# llvm for llvm-hs # llvm for llvm-hs
curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
@ -331,7 +334,7 @@ pushd /tmp \
&& make \ && make \
&& sudo make install \ && sudo make install \
&& popd \ && popd \
&& popd && popd
) )