clippy: fix cd

daimo-eth · Dec 2, 2024 · 8f02030 · 8f02030
1 parent 17c06cb
commit 8f02030
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -11,7 +11,7 @@ on:
 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:
@@ -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:

diff --git 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
@@ -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"

diff --git a/apps/daimo-mobile/src/view/screen/SettingsScreen.tsx b/apps/daimo-mobile/src/view/screen/SettingsScreen.tsx
@@ -210,7 +210,7 @@ function DevicesSection({ account }: { account: Account }) {
         chain={daimoChainFromId(account.homeChainId)}
         pendingRemoval={
           account.pendingKeyRotation.find(
-            (k) => k.rotationType === "remove" && k.slot === keyData.slot,
+            (k) => k.rotationType === "remove" && k.slot === keyData.slot
           ) !== undefined
         }
       />

diff --git a/apps/daimo-mobile/src/view/shared/error.tsx b/apps/daimo-mobile/src/view/shared/error.tsx
@@ -3,12 +3,12 @@ import Octicons from "@expo/vector-icons/Octicons";
 import { useMemo } from "react";
 import { Linking, Platform, StyleSheet, View } from "react-native";
 
-import { useExitToHome } from "../../common/nav";
-import { Colorway } from "../style/skins";
-import { useTheme } from "../style/theme";
 import { ButtonBig } from "./Button";
 import Spacer from "./Spacer";
 import { DaimoText, TextCenter, TextError, TextH3 } from "./text";
+import { useExitToHome } from "../../common/nav";
+import { Colorway } from "../style/skins";
+import { useTheme } from "../style/theme";
 
 export function ErrorRowCentered({
   error,