Merge pull request #2873 from poanetwork/ab-bump-elixir-to-1.9.4

bump elixir to 1.9.4
pull/2995/head
Victor Baranov 5 years ago committed by GitHub
commit 81e8f2aed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 32
      .circleci/config.yml
  2. 6
      .tool-versions
  3. 1
      CHANGELOG.md
  4. 2
      docker/Dockerfile

@ -3,7 +3,7 @@ jobs:
build: build:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1-node-browsers - image: circleci/elixir:1.9.4-node-browsers
environment: environment:
MIX_ENV: test MIX_ENV: test
# match POSTGRES_PASSWORD for postgres image below # match POSTGRES_PASSWORD for postgres image below
@ -63,6 +63,10 @@ jobs:
command: npm install command: npm install
working_directory: "apps/block_scout_web/assets" working_directory: "apps/block_scout_web/assets"
- run:
command: npm rebuild node-sass
working_directory: "apps/block_scout_web/assets"
- save_cache: - save_cache:
key: v7-npm-install-{{ .Branch }}-{{ checksum "apps/block_scout_web/assets/package-lock.json" }} key: v7-npm-install-{{ .Branch }}-{{ checksum "apps/block_scout_web/assets/package-lock.json" }}
paths: "apps/block_scout_web/assets/node_modules" paths: "apps/block_scout_web/assets/node_modules"
@ -129,7 +133,7 @@ jobs:
check_formatted: check_formatted:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: test MIX_ENV: test
@ -143,7 +147,7 @@ jobs:
credo: credo:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: test MIX_ENV: test
@ -177,7 +181,7 @@ jobs:
dialyzer: dialyzer:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: test MIX_ENV: test
@ -229,7 +233,7 @@ jobs:
eslint: eslint:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/node:12.13.0-browsers-legacy - image: circleci/node:12.14.1-browsers-legacy
working_directory: ~/app working_directory: ~/app
@ -247,7 +251,7 @@ jobs:
gettext: gettext:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: test MIX_ENV: test
@ -271,7 +275,7 @@ jobs:
jest: jest:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/node:12.13.0-browsers-legacy - image: circleci/node:12.14.1-browsers-legacy
working_directory: ~/app working_directory: ~/app
@ -286,7 +290,7 @@ jobs:
release: release:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: prod MIX_ENV: prod
@ -312,7 +316,7 @@ jobs:
sobelow: sobelow:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: test MIX_ENV: test
@ -336,7 +340,7 @@ jobs:
# test_geth_http_websocket: # test_geth_http_websocket:
# docker: # docker:
# # Ensure .tool-versions matches # # Ensure .tool-versions matches
# - image: circleci/elixir:1.9.1-node-browsers # - image: circleci/elixir:1.9.4-node-browsers
# environment: # environment:
# MIX_ENV: test # MIX_ENV: test
# # match POSTGRES_PASSWORD for postgres image below # # match POSTGRES_PASSWORD for postgres image below
@ -390,7 +394,7 @@ jobs:
# test_geth_mox: # test_geth_mox:
# docker: # docker:
# # Ensure .tool-versions matches # # Ensure .tool-versions matches
# - image: circleci/elixir:1.9.1-node-browsers # - image: circleci/elixir:1.9.4-node-browsers
# environment: # environment:
# MIX_ENV: test # MIX_ENV: test
# # match POSTGRES_PASSWORD for postgres image below # # match POSTGRES_PASSWORD for postgres image below
@ -444,7 +448,7 @@ jobs:
# test_parity_http_websocket: # test_parity_http_websocket:
# docker: # docker:
# # Ensure .tool-versions matches # # Ensure .tool-versions matches
# - image: circleci/elixir:1.9.1-node-browsers # - image: circleci/elixir:1.9.4-node-browsers
# environment: # environment:
# MIX_ENV: test # MIX_ENV: test
# # match POSTGRES_PASSWORD for postgres image below # # match POSTGRES_PASSWORD for postgres image below
@ -498,7 +502,7 @@ jobs:
test_parity_mox: test_parity_mox:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1-node-browsers - image: circleci/elixir:1.9.4-node-browsers
environment: environment:
MIX_ENV: test MIX_ENV: test
# match POSTGRES_PASSWORD for postgres image below # match POSTGRES_PASSWORD for postgres image below
@ -552,7 +556,7 @@ jobs:
coveralls_merge: coveralls_merge:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1 - image: circleci/elixir:1.9.4
environment: environment:
MIX_ENV: test MIX_ENV: test

@ -1,3 +1,3 @@
elixir 1.9.1-otp-22 elixir 1.9.4
erlang 22.0 erlang 22.2
nodejs 10.11.0 nodejs 12.14.1

@ -49,6 +49,7 @@
- [#2946](https://github.com/poanetwork/blockscout/pull/2946) - Fix vulnerable NPM deps - [#2946](https://github.com/poanetwork/blockscout/pull/2946) - Fix vulnerable NPM deps
- [#2942](https://github.com/poanetwork/blockscout/pull/2942) - Actualize Docker setup - [#2942](https://github.com/poanetwork/blockscout/pull/2942) - Actualize Docker setup
- [#2896](https://github.com/poanetwork/blockscout/pull/2896) - Disable Parity websockets tests - [#2896](https://github.com/poanetwork/blockscout/pull/2896) - Disable Parity websockets tests
- [#2873](https://github.com/poanetwork/blockscout/pull/2873) - bump elixir to 1.9.4
## 2.1.1-beta ## 2.1.1-beta

@ -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 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python

Loading…
Cancel
Save