Unverified Commit 4aad1823 authored by Francesco Gazzetta's avatar Francesco Gazzetta Committed by GitHub

Merge pull request #7319 from fgaz/fix-containerless-jobs

Fix containerless CI jobs by upgrading to ghc 8.10
parents 5ea2568f 401ee393
......@@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v2
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
- name: Smoke test
run: |
......@@ -42,17 +42,17 @@ jobs:
- name: Install GHC
run: |
cd $(mktemp -d)
curl -sLO "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz"
curl -sLO "https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-apple-darwin.tar.xz"
tar -xJf ghc-*.tar.xz
cd ghc-*
./configure --prefix=/opt/ghc/8.6.5
./configure --prefix=/opt/ghc/8.10.4
sudo make install
- uses: actions/checkout@v2
# We use linux dependencies
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
- name: Smoke test
run: |
......
......@@ -27,7 +27,7 @@ jobs:
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "/opt/cabal/3.2/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.6.5/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.10.4/bin" >> $GITHUB_PATH
- uses: actions/cache@v1
with:
path: ~/.cabal/store
......@@ -56,7 +56,7 @@ jobs:
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "/opt/cabal/3.2/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.6.5/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.10.4/bin" >> $GITHUB_PATH
- name: Install cabal-env
run: |
mkdir -p $HOME/.cabal/bin
......
{"dependencies":[{"source":"local","package":"Cabal","version":"3.5.0.0","flags":["-bundled-binary-generic"],"cabal_sha256":null,"src_sha256":null,"revision":null},{"source":"hackage","package":"splitmix","version":"0.1.0.3","flags":["-optimised-mixer"],"cabal_sha256":"fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c","src_sha256":"46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35","revision":0},{"source":"hackage","package":"random","version":"1.2.0","flags":[],"cabal_sha256":"30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9","src_sha256":"e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de","revision":5},{"source":"hackage","package":"hashable","version":"1.3.1.0","flags":["+integer-gmp"],"cabal_sha256":"d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076","src_sha256":"8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4","revision":0},{"source":"hackage","package":"async","version":"2.2.3","flags":["-bench"],"cabal_sha256":"0cbefb8247308b38e397e675f832b9bd5317ff1872001d5358f213654423c55b","src_sha256":"467af3a0037947a5232ecf5f4efbd4cf2118aaa2310566d7f40ac82b0e32935c","revision":0},{"source":"hackage","package":"tar","version":"0.5.1.1","flags":["-old-bytestring","-old-time"],"cabal_sha256":"94ded05718fe75b88c98e7113feeb9fca50688a7e59b6aefd80a6f48438c5062","src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","revision":3},{"source":"hackage","package":"network","version":"3.1.2.1","flags":["-devel"],"cabal_sha256":"188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b","src_sha256":"fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a","revision":1},{"source":"hackage","package":"th-compat","version":"0.1.1","flags":[],"cabal_sha256":"62f2dbddb23e0af39a4ea2f185911b172bc7533df3ca9b6ac9a6b22fc69e5831","src_sha256":"95fa20583ac236bc9ec6ba01350483e87a121a7893b4158651c700a60af603f9","revision":0},{"source":"hackage","package":"network-uri","version":"2.6.4.1","flags":[],"cabal_sha256":"a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d","src_sha256":"57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584","revision":0},{"source":"hackage","package":"HTTP","version":"4000.3.15","flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"cabal_sha256":"2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6","src_sha256":"0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594","revision":2},{"source":"hackage","package":"base16-bytestring","version":"0.1.1.7","flags":[],"cabal_sha256":"0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3","src_sha256":"525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba","revision":3},{"source":"hackage","package":"base64-bytestring","version":"1.2.0.1","flags":[],"cabal_sha256":"f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac","src_sha256":"af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638","revision":0},{"source":"hackage","package":"cryptohash-sha256","version":"0.11.102.0","flags":["-exe","+use-cbits"],"cabal_sha256":"daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424","src_sha256":"8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519","revision":0},{"source":"hackage","package":"echo","version":"0.1.4","flags":["-example"],"cabal_sha256":"ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42","src_sha256":"c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43","revision":0},{"source":"hackage","package":"edit-distance","version":"0.2.2.1","flags":[],"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","revision":1},{"source":"hackage","package":"ed25519","version":"0.0.5.0","flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"cabal_sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa","src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","revision":3},{"source":"hackage","package":"lukko","version":"0.1.1.3","flags":["+ofd-locking"],"cabal_sha256":"2db49b6cb6632a46ec446fc51870cd0d49e0a66d1c5d2063f46ae52a100eb856","src_sha256":"a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f","revision":1},{"source":"hackage","package":"zlib","version":"0.6.2.3","flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"cabal_sha256":"28f4d460c260e074cab833625454564b9783a3389b7bb91fd54da2790b39592c","src_sha256":"807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88","revision":0},{"source":"hackage","package":"hackage-security","version":"0.6.0.1","flags":["+base48","+lukko","-mtl21","-old-directory","+use-network-uri"],"cabal_sha256":"25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419","src_sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","revision":4},{"source":"hackage","package":"regex-base","version":"0.94.0.1","flags":[],"cabal_sha256":"6e3546b73cd5489201d481aa645a531f2c61aa317984e31c5f379ac0bcbfbfad","src_sha256":"71b1d96fff201f31fe8cd4532f056aca03a21cd486890256dc3007dd73adedd9","revision":0},{"source":"hackage","package":"regex-posix","version":"0.96.0.0","flags":["-_regex-posix-clib"],"cabal_sha256":"bd870f983a21bb474bd96449736f011c599981ce70da808a21ec1a28292e5481","src_sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","revision":2},{"source":"hackage","package":"resolv","version":"0.1.2.0","flags":[],"cabal_sha256":"4d61a65ac5522a869d9dd32c2a67c796f054abe3e4c70df2a13e6e241e23f5a6","src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","revision":1},{"source":"local","package":"cabal-install","version":"3.5.0.0","flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"cabal_sha256":null,"src_sha256":null,"revision":null}],"builtin":[{"package":"rts","version":"1.0"},{"package":"ghc-prim","version":"0.6.1"},{"package":"integer-gmp","version":"1.0.3.0"},{"package":"base","version":"4.14.1.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.4.0"},{"package":"bytestring","version":"0.10.12.0"},{"package":"containers","version":"0.6.2.1"},{"package":"binary","version":"0.8.8.0"},{"package":"filepath","version":"1.4.2.1"},{"package":"time","version":"1.9.3"},{"package":"unix","version":"2.7.2.2"},{"package":"directory","version":"1.3.6.0"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"ghc-boot-th","version":"8.10.4"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.16.0.0"},{"package":"text","version":"1.2.4.1"},{"package":"parsec","version":"3.1.14.0"},{"package":"process","version":"1.6.9.0"},{"package":"stm","version":"2.5.0.0"}]}
\ No newline at end of file
This diff is collapsed.
......@@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v2
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
- name: Smoke test
run: |
......@@ -42,17 +42,17 @@ jobs:
- name: Install GHC
run: |
cd $(mktemp -d)
curl -sLO "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz"
curl -sLO "https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-apple-darwin.tar.xz"
tar -xJf ghc-*.tar.xz
cd ghc-*
./configure --prefix=/opt/ghc/8.6.5
./configure --prefix=/opt/ghc/8.10.4
sudo make install
- uses: actions/checkout@v2
# We use linux dependencies
- name: bootstrap.py
run: |
python3 bootstrap/bootstrap.py -w /opt/ghc/8.6.5/bin/ghc -d bootstrap/linux-8.6.5.json
python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
- name: Smoke test
run: |
......
......@@ -27,7 +27,7 @@ jobs:
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "/opt/cabal/3.2/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.6.5/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.10.4/bin" >> $GITHUB_PATH
- uses: actions/cache@v1
with:
path: ~/.cabal/store
......@@ -56,7 +56,7 @@ jobs:
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "/opt/cabal/3.2/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.6.5/bin" >> $GITHUB_PATH
echo "/opt/ghc/8.10.4/bin" >> $GITHUB_PATH
- name: Install cabal-env
run: |
mkdir -p $HOME/.cabal/bin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment