From 1b035eb7c5acb589dcfcd9c7de59df4d1bce8de9 Mon Sep 17 00:00:00 2001 From: Adrian Wozniak Date: Fri, 1 May 2020 23:52:27 +0200 Subject: [PATCH] Fix client build --- .builds/client.yml | 7 +++++-- .builds/server.yml | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.builds/client.yml b/.builds/client.yml index 197d1c1b..0e2a8395 100644 --- a/.builds/client.yml +++ b/.builds/client.yml @@ -7,12 +7,12 @@ sources: - https://git.sr.ht/~tsumanu/jirs environment: deploy: adrian.wozniak@ita-prog.pl - NODE_ENV: production DEBUG: false JIRS_CLIENT_PORT: 80 JIRS_CLIENT_BIND: jirs.ita-prog.pl JIRS_SERVER_PORT: 80 JIRS_SERVER_BIND: jirs.ita-prog.pl + CI: true secrets: - 7ebab768-e5e4-4c9d-ba57-ec41a72c5665 tasks: @@ -22,12 +22,15 @@ tasks: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sudo sh - test: | cd ~/jirs/jirs-client + export NODE_ENV=development wasm-pack test --node - build: | cd ~/jirs/jirs-client - NODE_ENV=development yarn + export NODE_ENV=development + yarn yarn global add webpack-cli yarn add webpack-cli + export NODE_ENV=production yarn webpack-cli -p --config ./webpack.config.js - deploy: | cd ~/jirs diff --git a/.builds/server.yml b/.builds/server.yml index 639f4acc..8164d65f 100644 --- a/.builds/server.yml +++ b/.builds/server.yml @@ -11,9 +11,9 @@ secrets: tasks: - build_config: | cd jirs/jirs-server - cp ~/jirs/.builds/db.toml ~/jirs/jirs-server/db.toml + cp ../.builds/db.toml ./ - setup: | - 1 + sudo systemctl start postgresql || journalctl -xe rustup toolchain install nightly rustup default nightly cargo install diesel_cli --no-default-features --features postgres