From 52688b064af2e7b53308758dc1992215624ab430 Mon Sep 17 00:00:00 2001 From: Cheng Shao Date: Wed, 2 Dec 2020 14:36:09 +0100 Subject: [PATCH] Toolchain update (#829) --- .github/workflows/pipeline.yml | 10 +++++----- .github/workflows/setup-deps.sh | 2 +- base.Dockerfile | 6 +++--- dev.Dockerfile | 8 ++++---- dev.rootless.Dockerfile | 8 ++++---- ghc-toolkit/boot-libs/cabal.config | 18 +++++++++--------- stack-profile.yaml | 2 +- stack.yaml | 2 +- utils/gen-pkgs.hs | 2 +- utils/make-packages.py | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 328b8203..861c08b8 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -22,7 +22,7 @@ jobs: - name: setup-node-15 uses: actions/setup-node@v2-beta with: - node-version: 15.2.1 + node-version: 15.3.0 - name: checkout uses: actions/checkout@v2 @@ -88,7 +88,7 @@ jobs: - name: setup-node-15 uses: actions/setup-node@v2-beta with: - node-version: 15.2.1 + node-version: 15.3.0 - name: checkout uses: actions/checkout@v2 @@ -180,7 +180,7 @@ jobs: - name: setup-node-15 uses: actions/setup-node@v2-beta with: - node-version: 15.2.1 + node-version: 15.3.0 - name: checkout uses: actions/checkout@v2 @@ -227,7 +227,7 @@ jobs: - name: setup-node-15 uses: actions/setup-node@v2-beta with: - node-version: 15.2.1 + node-version: 15.3.0 - name: checkout uses: actions/checkout@v2 @@ -320,7 +320,7 @@ jobs: - name: setup-node-15 uses: actions/setup-node@v2-beta with: - node-version: 15.2.1 + node-version: 15.3.0 - name: setup-deps run: | diff --git a/.github/workflows/setup-deps.sh b/.github/workflows/setup-deps.sh index 021e9315..cda0a748 100755 --- a/.github/workflows/setup-deps.sh +++ b/.github/workflows/setup-deps.sh @@ -20,4 +20,4 @@ sudo dpkg -i /tmp/binaryen.deb rm /tmp/binaryen.deb sudo mkdir -p /opt/wasi-sdk -curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201027/wasi-sdk-11.6gc1fd249a52ea-linux.tar.gz | sudo tar xz -C /opt/wasi-sdk --strip-components=1 +curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201202/wasi-sdk-11.9gb368b8b12ee6-linux.tar.gz | sudo tar xz -C /opt/wasi-sdk --strip-components=1 diff --git a/base.Dockerfile b/base.Dockerfile index 6a136216..efbc658e 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -2,7 +2,7 @@ FROM debian:sid-slim ARG DEBIAN_FRONTEND=noninteractive -ARG NODE_VER=15.2.1 +ARG NODE_VER=15.3.0 ENV \ LANG=C.UTF-8 \ @@ -29,7 +29,7 @@ RUN \ python3-minimal \ zlib1g-dev && \ mkdir -p ${WASI_SDK_PATH} && \ - (curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201027/wasi-sdk-11.6gc1fd249a52ea-linux.tar.gz | tar xz -C ${WASI_SDK_PATH} --strip-components=1) && \ + (curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201202/wasi-sdk-11.9gb368b8b12ee6-linux.tar.gz | tar xz -C ${WASI_SDK_PATH} --strip-components=1) && \ cp \ /etc/skel/.bash_logout \ /etc/skel/.bashrc \ @@ -41,7 +41,7 @@ WORKDIR /root COPY . /root/.asterius RUN \ - (curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash) && \ + (curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash) && \ bash -i -c "nvm install ${NODE_VER}" && \ patch ~/.nvm/versions/node/v${NODE_VER}/lib/node_modules/npm/node_modules/@npmcli/promise-spawn/index.js ~/.asterius/utils/promise-spawn.patch && \ bash -i -c "npm install -g --unsafe-perm=true --allow-root @cloudflare/wrangler webpack webpack-cli" && \ diff --git a/dev.Dockerfile b/dev.Dockerfile index 4858b191..7b8977ac 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -2,7 +2,7 @@ FROM debian:sid ARG DEBIAN_FRONTEND=noninteractive -ARG NODE_VER=15.2.1 +ARG NODE_VER=15.3.0 ENV \ BROWSER=echo \ @@ -39,7 +39,7 @@ RUN \ zlib1g-dev \ zstd && \ mkdir -p ${WASI_SDK_PATH} && \ - (curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201027/wasi-sdk-11.6gc1fd249a52ea-linux.tar.gz | tar xz -C ${WASI_SDK_PATH} --strip-components=1) && \ + (curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201202/wasi-sdk-11.9gb368b8b12ee6-linux.tar.gz | tar xz -C ${WASI_SDK_PATH} --strip-components=1) && \ apt autoremove --purge -y && \ apt clean && \ rm -rf -v /var/lib/apt/lists/* && \ @@ -54,7 +54,7 @@ WORKDIR /root COPY . /tmp/asterius RUN \ - (curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash) && \ + (curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash) && \ bash -i -c "nvm install ${NODE_VER}" && \ patch ~/.nvm/versions/node/v${NODE_VER}/lib/node_modules/npm/node_modules/@npmcli/promise-spawn/index.js /tmp/asterius/utils/promise-spawn.patch && \ bash -i -c "npm install -g --unsafe-perm=true --allow-root @cloudflare/wrangler webpack webpack-cli" && \ @@ -70,7 +70,7 @@ RUN \ RUN \ stack --no-terminal update && \ - stack --no-terminal --resolver lts-16.23 install \ + stack --no-terminal --resolver lts-16.24 install \ brittany \ ghcid \ ormolu \ diff --git a/dev.rootless.Dockerfile b/dev.rootless.Dockerfile index 9acf18cb..7e1037bb 100644 --- a/dev.rootless.Dockerfile +++ b/dev.rootless.Dockerfile @@ -38,7 +38,7 @@ ARG DEBIAN_FRONTEND ARG USERNAME ARG UID -ARG NODE_VER=15.2.1 +ARG NODE_VER=15.3.0 ENV \ BROWSER=echo \ @@ -74,7 +74,7 @@ RUN \ zlib1g-dev \ zstd && \ sudo mkdir -p ${WASI_SDK_PATH} && \ - (curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201027/wasi-sdk-11.6gc1fd249a52ea-linux.tar.gz | sudo tar xz -C ${WASI_SDK_PATH} --strip-components=1) && \ + (curl -L https://github.com/TerrorJack/wasi-sdk/releases/download/201202/wasi-sdk-11.9gb368b8b12ee6-linux.tar.gz | sudo tar xz -C ${WASI_SDK_PATH} --strip-components=1) && \ sudo apt autoremove --purge -y && \ sudo apt clean && \ sudo rm -rf -v \ @@ -83,7 +83,7 @@ RUN \ /var/tmp/* RUN \ - (curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash) && \ + (curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash) && \ bash -i -c "nvm install ${NODE_VER}" && \ bash -i -c "npm install -g @cloudflare/wrangler webpack webpack-cli" && \ mkdir -p ~/.local/bin && \ @@ -98,7 +98,7 @@ RUN \ RUN \ stack --no-terminal update && \ - stack --no-terminal --resolver lts-16.23 install \ + stack --no-terminal --resolver lts-16.24 install \ brittany \ ghcid \ ormolu \ diff --git a/ghc-toolkit/boot-libs/cabal.config b/ghc-toolkit/boot-libs/cabal.config index 594b2981..d3cacaa1 100644 --- a/ghc-toolkit/boot-libs/cabal.config +++ b/ghc-toolkit/boot-libs/cabal.config @@ -1,4 +1,4 @@ -index-state: 2020-11-22T00:00:00Z +index-state: 2020-12-01T00:00:00Z constraints: HsOpenSSL -fast-bignum, @@ -141,7 +141,7 @@ constraints: ad ==4.4.1, adjunctions ==4.4, adler32 ==0.1.2.0, - advent-of-code-api ==0.2.7.0, + advent-of-code-api ==0.2.7.1, aeson ==1.4.7.1, aeson-attoparsec ==0.0.0, aeson-better-errors ==0.9.1.0, @@ -435,7 +435,7 @@ constraints: bytestring-mmap ==0.2.2, bytestring-strict-builder ==0.4.5.3, bytestring-to-vector ==0.3.0.1, - bytestring-tree-builder ==0.2.7.5, + bytestring-tree-builder ==0.2.7.7, bz2 ==1.0.0.1, bzlib-conduit ==0.3.0.2, c2hs ==0.28.6, @@ -541,7 +541,7 @@ constraints: concurrent-split ==0.0.1.1, concurrent-supply ==0.1.8, cond ==0.4.1.1, - conduit ==1.3.3, + conduit ==1.3.4, conduit-algorithms ==0.0.11.0, conduit-combinators ==1.3.0, conduit-concurrent-map ==0.1.1, @@ -670,7 +670,7 @@ constraints: deepseq ==1.4.4.0, deepseq-generics ==0.2.0.0, deepseq-instances ==0.1.0.1, - deferred-folds ==0.9.11, + deferred-folds ==0.9.15, dejafu ==2.3.0.1, dense-linear-algebra ==0.1.0.0, depq ==0.4.1.0, @@ -762,7 +762,7 @@ constraints: elm-bridge ==0.6.1, elm-core-sources ==1.0.0, elm-export ==0.6.0.1, - elm2nix ==0.2, + elm2nix ==0.2.1, emacs-module ==0.1.1, email-validate ==2.3.2.13, emojis ==0.1, @@ -1493,7 +1493,7 @@ constraints: monad-coroutine ==0.9.0.4, monad-extras ==0.6.0, monad-journal ==0.8.1, - monad-logger ==0.3.35, + monad-logger ==0.3.36, monad-logger-json ==0.1.0.0, monad-logger-prefix ==0.1.11, monad-loops ==0.4.3, @@ -2270,7 +2270,7 @@ constraints: time-units ==1.0.0, timeit ==2.0, timelens ==0.2.0.2, - timerep ==2.0.0.2, + timerep ==2.0.1.0, timezone-olson ==0.2.0, timezone-series ==0.1.9, tinylog ==0.15.0, @@ -2332,7 +2332,7 @@ constraints: uglymemo ==0.1.0.1, ulid ==0.3.0.0, unagi-chan ==0.4.1.3, - unbounded-delays ==0.1.1.0, + unbounded-delays ==0.1.1.1, unboxed-ref ==0.4.0.0, unboxing-vector ==0.1.1.0, uncertain ==0.3.1.0, diff --git a/stack-profile.yaml b/stack-profile.yaml index 2cf708ec..3c6ef344 100644 --- a/stack-profile.yaml +++ b/stack-profile.yaml @@ -4,7 +4,7 @@ build: library-profiling: true executable-profiling: true -resolver: lts-16.23 +resolver: lts-16.24 extra-deps: - binaryen-0.0.5.0 - url: https://github.com/tweag/inline-js/archive/ef675745e84d23d51c50660d40acf9e684fbb2d6.tar.gz diff --git a/stack.yaml b/stack.yaml index 797e6858..6820cad9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-16.23 +resolver: lts-16.24 extra-deps: - binaryen-0.0.5.0 - url: https://github.com/tweag/inline-js/archive/ef675745e84d23d51c50660d40acf9e684fbb2d6.tar.gz diff --git a/utils/gen-pkgs.hs b/utils/gen-pkgs.hs index 35c384f7..8c4a94fd 100755 --- a/utils/gen-pkgs.hs +++ b/utils/gen-pkgs.hs @@ -1,6 +1,6 @@ #!/usr/bin/env stack {- - stack --resolver lts-16.23 script + stack --resolver lts-16.24 script --package Cabal --package containers --package pantry diff --git a/utils/make-packages.py b/utils/make-packages.py index c43f0208..aff6b003 100755 --- a/utils/make-packages.py +++ b/utils/make-packages.py @@ -101,7 +101,7 @@ def ghc_configure(): def patch_hadrian(): with open(os.path.join(ghc_repo_path, "hadrian", "stack.yaml"), mode="w") as f: - f.write("resolver: lts-16.23\n") + f.write("resolver: lts-16.24\n") with open(os.path.join(ghc_repo_path, "hadrian", "src", "Oracles", "Setting.hs"), mode="r") as h: