Skip to content

Commit

Permalink
clippy: fix cd
Browse files Browse the repository at this point in the history
  • Loading branch information
dcposch committed Dec 2, 2024
1 parent 17c06cb commit 7507755
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -103,7 +104,6 @@ jobs:
run: aws ecs update-service --cluster $CLUSTER_NAME --service $SERVICE_NAME --force-new-deployment > /dev/null

clippy-deploy:
if: github.ref == 'refs/heads/master'
name: Clippy Deploy
runs-on: ubuntu-latest
steps:
Expand All @@ -124,6 +124,15 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- uses: actions/setup-node@v3
with:
node-version: "22.x"

- name: Build JS bundle
run: |
npm ci
npx turbo build --filter='@daimo/clippy'
- name: Build, tag, and push docker image to Amazon ECR
uses: docker/build-push-action@v5
with:
Expand Down
10 changes: 2 additions & 8 deletions apps/daimo-clippy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions apps/daimo-clippy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7507755

Please sign in to comment.