aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Use rust-toolchain in buildenv' (#1088) from buildenv-rust-toolchain into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1088
This commit is contained in:
KitaitiMakoto 2022-05-15 02:16:39 +00:00
commit 821fce1903
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -10,7 +10,7 @@ executors:
type: boolean type: boolean
default: false default: false
docker: docker:
- image: plumeorg/plume-buildenv:v0.5.0 - image: plumeorg/plume-buildenv:v0.6.0
- image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>> - image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres

3
.circleci/images/plume-buildenv/Dockerfile
View File

@ -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 &&\ 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/* rm -rf /var/lib/apt/lists/*
#stick rust environment
COPY rust-toolchain ./
#compile some deps #compile some deps
RUN cargo install wasm-pack &&\ RUN cargo install wasm-pack &&\
cargo install grcov &&\ cargo install grcov &&\

1
.circleci/images/plume-buildenv/rust-toolchain Normal file
View File

@ -0,0 +1 @@
nightly-2022-01-27