From 796d08ea8f07ab980e5efce262d407bd95bb8d45 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 25 Nov 2019 08:14:52 +0300 Subject: [PATCH 1/4] bump elixir to 1.9.4 --- .circleci/config.yml | 24 ++++++++++++------------ .tool-versions | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3582157cea..9d826396ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1-node-browsers + - image: circleci/elixir:1.9.4-node-browsers environment: MIX_ENV: test # match POSTGRES_PASSWORD for postgres image below @@ -129,7 +129,7 @@ jobs: check_formatted: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: test @@ -143,7 +143,7 @@ jobs: credo: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: test @@ -177,7 +177,7 @@ jobs: dialyzer: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: test @@ -247,7 +247,7 @@ jobs: gettext: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: test @@ -286,7 +286,7 @@ jobs: release: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: prod @@ -312,7 +312,7 @@ jobs: sobelow: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: test @@ -336,7 +336,7 @@ jobs: # test_geth_http_websocket: # docker: # # Ensure .tool-versions matches - # - image: circleci/elixir:1.9.1-node-browsers + # - image: circleci/elixir:1.9.4-node-browsers # environment: # MIX_ENV: test # # match POSTGRES_PASSWORD for postgres image below @@ -390,7 +390,7 @@ jobs: # test_geth_mox: # docker: # # Ensure .tool-versions matches - # - image: circleci/elixir:1.9.1-node-browsers + # - image: circleci/elixir:1.9.4-node-browsers # environment: # MIX_ENV: test # # match POSTGRES_PASSWORD for postgres image below @@ -444,7 +444,7 @@ jobs: test_parity_http_websocket: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1-node-browsers + - image: circleci/elixir:1.9.4-node-browsers environment: MIX_ENV: test # match POSTGRES_PASSWORD for postgres image below @@ -498,7 +498,7 @@ jobs: test_parity_mox: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1-node-browsers + - image: circleci/elixir:1.9.4-node-browsers environment: MIX_ENV: test # match POSTGRES_PASSWORD for postgres image below @@ -552,7 +552,7 @@ jobs: coveralls_merge: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.9.1 + - image: circleci/elixir:1.9.4 environment: MIX_ENV: test diff --git a/.tool-versions b/.tool-versions index 785ba751f8..e138ee9b57 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -elixir 1.9.1-otp-22 -erlang 22.0 +elixir 1.9.4-otp-22 +erlang 22.1 nodejs 10.11.0 From 475ed4a372273870e553ba5891b49e0ade25167f Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 25 Nov 2019 08:23:11 +0300 Subject: [PATCH 2/4] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19a8c2a496..d4495cf3d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - [#2803](https://github.com/poanetwork/blockscout/pull/2803) - Fix block validator custom tooltip ### Chore +- [#2873](https://github.com/poanetwork/blockscout/pull/2873) - bump elixir to 1.9.4 - [#2859](https://github.com/poanetwork/blockscout/pull/2859) - Add eth_blockNumber API endpoint to eth_rpc section - [#2846](https://github.com/poanetwork/blockscout/pull/2846) - Remove networks images preload - [#2845](https://github.com/poanetwork/blockscout/pull/2845) - Set outline none for nav dropdown item in mobile view (fix for Safari) From d31fcb5f1d985d837cc04ef4325c9a5edab8e4de Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 28 Jan 2020 17:25:21 +0300 Subject: [PATCH 3/4] update erlang version and elixir image in Docker file --- .circleci/config.yml | 4 ++-- .tool-versions | 6 +++--- docker/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba3b32a70f..8ffa05c4d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -229,7 +229,7 @@ jobs: eslint: docker: # Ensure .tool-versions matches - - image: circleci/node:12.13.0-browsers-legacy + - image: circleci/node:12.14.1-browsers-legacy working_directory: ~/app @@ -271,7 +271,7 @@ jobs: jest: docker: # Ensure .tool-versions matches - - image: circleci/node:12.13.0-browsers-legacy + - image: circleci/node:12.14.1-browsers-legacy working_directory: ~/app diff --git a/.tool-versions b/.tool-versions index e138ee9b57..cef9d24642 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -elixir 1.9.4-otp-22 -erlang 22.1 -nodejs 10.11.0 +elixir 1.9.4 +erlang 22.2 +nodejs 12.14.1 diff --git a/docker/Dockerfile b/docker/Dockerfile index 65a46ccced..9286d59648 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM bitwalker/alpine-elixir-phoenix:1.9.1 +FROM bitwalker/alpine-elixir-phoenix:1.9.4 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python From 168c97c86ad6c939dcb100008907722e8e378ee3 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 30 Jan 2020 12:12:01 +0300 Subject: [PATCH 4/4] npm rebuild node-sass --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ffa05c4d4..b76edbf94d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,6 +63,10 @@ jobs: command: npm install working_directory: "apps/block_scout_web/assets" + - run: + command: npm rebuild node-sass + working_directory: "apps/block_scout_web/assets" + - save_cache: key: v7-npm-install-{{ .Branch }}-{{ checksum "apps/block_scout_web/assets/package-lock.json" }} paths: "apps/block_scout_web/assets/node_modules"