fix: build fdr to dist (#587)

Co-authored-by: dsinghvi <[email protected]>
fern-api · Mar 28, 2024 · f9b4b9c · f9b4b9c
1 parent 09245c0
commit f9b4b9c
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,13 +88,6 @@ jobs:
           pnpm fern generate --local
           pnpm turbo --filter=@fern-platform/fdr codegen
 
-      - name: Setup database
-        # TODO: re-enable when moving to turbo
-        # pnpm turbo --filter= docker:local
-        run: |
-          pnpm turbo --filter=@fern-platform/fdr test-db
-          pnpm turbo --filter=@fern-platform/fdr test-ete
-
       - name: Run tests
         run: pnpm test
         env:

diff --git a/.github/workflows/fdr-ete.yml b/.github/workflows/fdr-ete.yml
@@ -0,0 +1,37 @@
+name: Test FDR ETE
+
+on:
+  push:
+    paths:
+      - 'fern/apis/fdr/**'
+      - 'fern/fern.config.json'
+      - 'servers/fdr-deploy/**'
+      - 'servers/fdr/**'
+      - '.github/workflows/deploy-fdr.yml'
+      - 'packages/fdr-sdk/**'
+
+env:
+  PACKAGE_NAME: "@fern-platform/fdr"
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  TURBO_TEAM: "buildwithfern"
+  FERN_TOKEN: ${{ secrets.FERN_TOKEN }}
+
+jobs: 
+  run: 
+    runs-on: ubuntu-latest    
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2 # This helps turbo resolve changes faster
+
+      - name: Install
+        uses: ./.github/actions/install
+
+      - name: Setup database
+        # TODO: re-enable when moving to turbo
+        # pnpm turbo --filter= docker:local
+        run: |
+          cd servers/fdr
+          pnpm run docker:local
+          pnpm run test:ete
+  
diff --git a/packages/configs/tsconfig/server.json b/packages/configs/tsconfig/server.json
@@ -3,7 +3,6 @@
   "display": "Server",
   "extends": "./base.json",
   "compilerOptions": {
-    "noEmit": true,
     "allowJs": true,
     "module": "esnext",
     "moduleResolution": "bundler",

diff --git a/servers/fdr/Dockerfile b/servers/fdr/Dockerfile
@@ -33,7 +33,7 @@ COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
 COPY shared shared
 COPY fern fern
-RUN pnpm turbo run build --filter=@fern-platform/fdr
+RUN pnpm turbo run compile --filter=@fern-platform/fdr
 
 FROM base AS runner
 WORKDIR /app

diff --git a/servers/fdr/package.json b/servers/fdr/package.json
@@ -77,6 +77,7 @@
     "docker:dev": "dotenv -e .env.dev -- ./create_docker.sh",
     "docker:prod": "dotenv -e .env.prod -- ./create_docker.sh",
     "test": "vitest src/__test__/unit-tests --globals",
+    "test:ete": "dotenv -e .env.ete -- ./scripts/ete-tests.sh",
     "lint": "eslint --max-warnings 0 src --ext .ts",
     "lint:fix": "pnpm lint --fix",
     "test-db": "dotenv -e .env.test -- ./scripts/db-tests.sh",

diff --git a/servers/fdr/scripts/ete-tests.sh b/servers/fdr/scripts/ete-tests.sh
@@ -4,7 +4,7 @@ cd ..
 docker-compose -f docker-compose.ete.yml up -d
 
 echo "Sleeping for 5s..."
-sleep 5
+sleep 10
 
 pnpm prisma migrate deploy
 

diff --git a/servers/fdr/src/__test__/ete/ete.test.ts b/servers/fdr/src/__test__/ete/ete.test.ts
@@ -5,7 +5,7 @@ import { ParsedBaseUrl } from "../../util/ParsedBaseUrl";
 const PORT = 8080;
 
 // We don't spin up the server in this test.
-it.skip("definition register", async () => {
+it("definition register", async () => {
     // register empty definition
     const healthResponse = await axios.get(`http://localhost:${PORT}/health`);
     expect(healthResponse.status).toEqual(200);