From ea75d606c36ecdb5ca3bc42ee1fec56db8239d8f Mon Sep 17 00:00:00 2001 From: DC Date: Mon, 2 Dec 2024 01:56:07 -0800 Subject: [PATCH] clippy: fix cd --- .github/workflows/cd.yml | 3 ++- apps/daimo-clippy/Dockerfile | 10 ++-------- apps/daimo-clippy/package.json | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8ddf1a43a..f6570d958 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -5,13 +5,14 @@ on: branches: - master - prod + - dc/mobile tags: - "v*.*.*" jobs: api-deploy: # master and prod only, no tags - if: startsWith(github.ref, 'refs/heads/') + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/prod' name: API Deploy runs-on: ubuntu-latest steps: diff --git a/apps/daimo-clippy/Dockerfile b/apps/daimo-clippy/Dockerfile index 579054769..0110b80d1 100644 --- a/apps/daimo-clippy/Dockerfile +++ b/apps/daimo-clippy/Dockerfile @@ -5,16 +5,10 @@ FROM node:20 WORKDIR /usr/src/app # Copy app code -COPY . . - -# Install dependencies -RUN npm ci - -# Build app -RUN npm run build:clippy +COPY apps/daimo-clippy/dist ./dist # Expose the port the app runs on EXPOSE 4200 # Start app -CMD ["npm", "start", "--prefix", "./apps/daimo-clippy"] +CMD ["node", "dist/index.js"] diff --git a/apps/daimo-clippy/package.json b/apps/daimo-clippy/package.json index 81e79566c..226d32cc1 100644 --- a/apps/daimo-clippy/package.json +++ b/apps/daimo-clippy/package.json @@ -3,8 +3,8 @@ "version": "1.0.0", "main": "src/index.ts", "scripts": { - "dev": "echo Use 'npm start' for Clippy dev", - "start": "tsx src/index.ts", + "dev": "tsx src/index.ts", + "build": "esbuild --bundle src/index.ts --platform=node --external:readline/promises --outdir=dist", "lint": "npm run lint:deps && npm run lint:style", "lint:deps": "npx depcheck --ignores @tsconfig/node20,@types/tape", "lint:style": "eslint . --max-warnings=0"