From 5ede204289b6be0d756c87af94134ff27983ffed Mon Sep 17 00:00:00 2001 From: catlair Date: Sat, 1 May 2021 19:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yaml | 20 ++++++++++++++++++++ src/config/log4js.ts | 5 ----- tools/random_run.sh | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 4c93151..6917af5 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -9,6 +9,26 @@ jobs: runs-on: ubuntu-latest environment: Build steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Preparation + run: | + echo '!node_modules' >> .dockerignore + echo '!dist' >> .dockerignore + sed -i '14,18d' Dockerfile + + - name: Use Node.js 14.x + uses: actions/setup-node@v2 + with: + node-version: 14.x + + - name: install and build + run: | + npm install + npm run build + npm prune --production + - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/src/config/log4js.ts b/src/config/log4js.ts index 2ac0eed..474ad48 100644 --- a/src/config/log4js.ts +++ b/src/config/log4js.ts @@ -14,11 +14,6 @@ const loggerLevel = levels.includes(loggerLevelENV) ? loggerLevelENV : 'INFO'; const options = { appenders: { console: { - type: 'logLevelFilter', - level: loggerLevel, - appender: 'consoleCurrent', - }, - consoleCurrent: { type: 'console', }, everything: { diff --git a/tools/random_run.sh b/tools/random_run.sh index 628671a..166cf3c 100644 --- a/tools/random_run.sh +++ b/tools/random_run.sh @@ -10,6 +10,7 @@ function random() echo $retnum; } # 旧的不去新的不来 +docker pull catlair/bilitaskpuppeteer:latest docker-compose -f docker/docker-compose.yml down # 等待时间为执行开始后2 - 7200s中随机时间 out=$(random 2 7200)s;