From 35fb57718d3b9f992355aeb32ae2f68ee87b6769 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 06:43:00 +0900 Subject: [PATCH 1/2] Add rust-toolchain into buildenv --- .circleci/images/plume-buildenv/Dockerfile | 3 +++ .circleci/images/plume-buildenv/rust-toolchain | 1 + 2 files changed, 4 insertions(+) create mode 100644 .circleci/images/plume-buildenv/rust-toolchain diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 58785a08..1e52bc5f 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -12,6 +12,9 @@ RUN apt update &&\ apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-venv python3-dev zip unzip libclang-dev clang caddy crowdin3 &&\ rm -rf /var/lib/apt/lists/* +#stick rust environment +COPY rust-toolchain ./ + #compile some deps RUN cargo install wasm-pack &&\ cargo install grcov &&\ diff --git a/.circleci/images/plume-buildenv/rust-toolchain b/.circleci/images/plume-buildenv/rust-toolchain new file mode 100644 index 00000000..63af764b --- /dev/null +++ b/.circleci/images/plume-buildenv/rust-toolchain @@ -0,0 +1 @@ +nightly-2022-01-27 From ce484de61ef33045446946fefbc49604963dbfe9 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 11:15:05 +0900 Subject: [PATCH 2/2] Bump buildenv image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6adfb3cd..8e723f88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ executors: type: boolean default: false docker: - - image: plumeorg/plume-buildenv:v0.5.0 + - image: plumeorg/plume-buildenv:v0.6.0 - image: <<#parameters.postgres>>cimg/postgres:14.2<><<^parameters.postgres>>alpine:latest<> environment: POSTGRES_USER: postgres