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

Merge pull request 'Fix .venv path in buildenv' (#1090) from venv-path into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1090
This commit is contained in:
KitaitiMakoto 2022-05-17 17:39:10 +00:00
commit 3b0b6c4b0b
3 changed files with 3 additions and 4 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.6.0 - image: plumeorg/plume-buildenv:v0.7.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

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

@ -9,7 +9,7 @@ RUN apt update &&\
wget -qO - https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | apt-key add - &&\ wget -qO - https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | apt-key add - &&\
echo "deb https://artifacts.crowdin.com/repo/deb/ /" > /etc/apt/sources.list.d/crowdin.list &&\ echo "deb https://artifacts.crowdin.com/repo/deb/ /" > /etc/apt/sources.list.d/crowdin.list &&\
apt update &&\ 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-dev python3-pip python3-setuptools zip unzip libclang-dev clang caddy crowdin3 &&\
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
#stick rust environment #stick rust environment
@ -24,7 +24,7 @@ RUN cargo install wasm-pack &&\
COPY cargo_config /root/.cargo/config COPY cargo_config /root/.cargo/config
#install selenium for front end tests #install selenium for front end tests
RUN python3 -m venv .venv && bash -c "source .venv/bin/activate && pip3 install selenium" RUN pip3 install selenium
#configure caddy #configure caddy
COPY Caddyfile /Caddyfile COPY Caddyfile /Caddyfile

1
script/run_browser_test.sh
View File

@ -14,7 +14,6 @@ caddy run -config /Caddyfile &
until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null
source .venv/bin/activate
cd $(dirname $0)/browser_test/ cd $(dirname $0)/browser_test/
python3 -m unittest *.py python3 -m unittest *.py