mirror of
https://git.joinplu.me/Plume/Plume.git
synced 2024-11-25 04:51:27 +00:00
Merge pull request 'Use rust-toolchain in buildenv' (#1088) from buildenv-rust-toolchain into main
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1088
This commit is contained in:
commit
821fce1903
3 changed files with 5 additions and 1 deletions
|
@ -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>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
|
|
|
@ -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 &&\
|
||||
|
|
1
.circleci/images/plume-buildenv/rust-toolchain
Normal file
1
.circleci/images/plume-buildenv/rust-toolchain
Normal file
|
@ -0,0 +1 @@
|
|||
nightly-2022-01-27
|
Loading…
Reference in a new issue