From 8ac29683edbdca64541ed969ebb15f438821ee2d Mon Sep 17 00:00:00 2001 From: jiro4989 Date: Mon, 9 Dec 2019 22:38:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:recycle:=20=E3=82=B5=E3=83=BC=E3=83=93?= =?UTF-8?q?=E3=82=B9=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index bbdb327..c8461b1 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -1,23 +1,23 @@ version: '3.7' services: - build_server: + server: image: jiro4989/websh:latest volumes: - "./websh_server:/work" working_dir: /work - entrypoint: - - nimble + entrypoint: nimble + command: - build - -d:release - -Y - build_front: + front: image: jiro4989/websh:latest volumes: - "./websh_front:/work" working_dir: /work - entrypoint: - - nimble + entrypoint: nimble + command: - build - -Y From 1343253e3222fb3470d3692c94c032d5fb74060c Mon Sep 17 00:00:00 2001 From: jiro4989 Date: Mon, 9 Dec 2019 22:39:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:green=5Fheart:=20up=E3=81=A0=E3=81=A8?= =?UTF-8?q?=E5=A4=B1=E6=95=97=E3=81=97=E3=81=A6=E3=82=82exit=201=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=82=89=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7run?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9756f0..6a4b220 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,8 +9,12 @@ jobs: - uses: actions/checkout@v1 - name: Pull docker image run: docker pull jiro4989/websh:latest - - name: Build - run: docker-compose -f docker-compose-ci.yml up + - name: Test server + run: docker-compose -f docker-compose-ci.yml run server test -Y + - name: Build server + run: docker-compose -f docker-compose-ci.yml run server + - name: Build front + run: docker-compose -f docker-compose-ci.yml run front - name: Archive release files run: | mkdir -p dist/websh