From 145253ccbf221b3e4ae7aaf6c891151180307115 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 11:41:50 +0900 Subject: [PATCH 1/4] Fix .venv path in buildenv --- script/run_browser_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/run_browser_test.sh b/script/run_browser_test.sh index faa4b25e..60dfb6ab 100755 --- a/script/run_browser_test.sh +++ b/script/run_browser_test.sh @@ -14,7 +14,7 @@ caddy run -config /Caddyfile & until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null -source .venv/bin/activate +source ../.venv/bin/activate cd $(dirname $0)/browser_test/ python3 -m unittest *.py From f372282b040b42b4158da2d948dc1922c959827b Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 16 May 2022 12:20:06 +0900 Subject: [PATCH 2/4] Use apt package for setuptools instead of pyenv --- .circleci/images/plume-buildenv/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 1e52bc5f..420f0354 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -9,12 +9,15 @@ RUN apt update &&\ 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 &&\ 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/* #stick rust environment COPY rust-toolchain ./ +#add rust toolchains +RUN rustup component add fmt && rustup component add clippy + #compile some deps RUN cargo install wasm-pack &&\ cargo install grcov &&\ @@ -24,7 +27,7 @@ RUN cargo install wasm-pack &&\ COPY cargo_config /root/.cargo/config #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 COPY Caddyfile /Caddyfile From b26822c0459ff18567cdbda9479f18a28de2b02d Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 16 May 2022 12:21:55 +0900 Subject: [PATCH 3/4] Update buildenv image --- .circleci/config.yml | 2 +- .circleci/images/plume-buildenv/Dockerfile | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3620b26..f5ac952d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ executors: type: boolean default: false docker: - - image: plumeorg/plume-buildenv:v0.6.0 + - image: plumeorg/plume-buildenv:v0.7.0 - image: <<#parameters.postgres>>cimg/postgres:14.2<><<^parameters.postgres>>alpine:latest<> environment: POSTGRES_USER: postgres diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 420f0354..216b30e1 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -15,9 +15,6 @@ RUN apt update &&\ #stick rust environment COPY rust-toolchain ./ -#add rust toolchains -RUN rustup component add fmt && rustup component add clippy - #compile some deps RUN cargo install wasm-pack &&\ cargo install grcov &&\ From 4328fad5a363cd38b26e6259384cdc50548115ae Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Wed, 18 May 2022 02:15:15 +0900 Subject: [PATCH 4/4] Don't load venv --- script/run_browser_test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/script/run_browser_test.sh b/script/run_browser_test.sh index 60dfb6ab..96294500 100755 --- a/script/run_browser_test.sh +++ b/script/run_browser_test.sh @@ -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 -source ../.venv/bin/activate cd $(dirname $0)/browser_test/ python3 -m unittest *.py