Merge pull request 'Update CI environment' (#1123) from clippy-on-ci into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1123
This commit is contained in:
KitaitiMakoto 2023-01-03 09:30:54 +00:00
commit 4e1fb64868
5 changed files with 7 additions and 4 deletions

View File

@ -10,7 +10,7 @@ executors:
type: boolean type: boolean
default: false default: false
docker: docker:
- image: plumeorg/plume-buildenv:v0.7.0 - image: plumeorg/plume-buildenv:v0.8.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

View File

@ -1,4 +1,4 @@
FROM rust:1-buster FROM rust:1
ENV PATH="/root/.cargo/bin:${PATH}" ENV PATH="/root/.cargo/bin:${PATH}"
#install native/circleci/build dependancies #install native/circleci/build dependancies
@ -14,6 +14,7 @@ RUN apt update &&\
#stick rust environment #stick rust environment
COPY rust-toolchain ./ COPY rust-toolchain ./
RUN rustup component add rustfmt clippy
#compile some deps #compile some deps
RUN cargo install wasm-pack &&\ RUN cargo install wasm-pack &&\

View File

@ -1 +1 @@
nightly-2022-01-27 nightly-2022-07-19

View File

@ -3,3 +3,5 @@ data
Dockerfile Dockerfile
docker-compose.yml docker-compose.yml
.env .env
target
data

View File

@ -3,4 +3,4 @@ set -euo pipefail
version="$1" version="$1"
docker run --rm -v $PWD:/repo -v $PWD/pkg:/pkg -v $PWD/script/prebuild.sh:/prebuild.sh plumeorg/plume-buildenv:v0.4.0 /prebuild.sh "$version" /repo /prebuild /pkg docker run --rm -v $PWD:/repo -v $PWD/pkg:/pkg -v $PWD/script/prebuild.sh:/prebuild.sh plumeorg/plume-buildenv:v0.7.0 /prebuild.sh "$version" /repo /prebuild /pkg