Merge pull request #52 from refly-ai/chore/monorepo-github-actions

chore: adjust github actions for monorepo
refly-ai · Jun 4, 2024 · a1448eb · a1448eb
2 parents f0f9310 + b865741
commit a1448eb
Show file tree

Hide file tree

Showing 47 changed files with 524 additions and 2,302 deletions.
diff --git a/.aws/ecs-task-definition.json b/.aws/ecs-task-definition.json
@@ -30,10 +30,7 @@
         "secretOptions": []
       },
       "healthCheck": {
-        "command": [
-          "CMD-SHELL",
-          "curl -f http://localhost:3000 >> /proc/1/fd/1 2>&1 || exit 1"
-        ],
+        "command": ["CMD-SHELL", "curl -sSf http://localhost:3000 >> /proc/1/fd/1 2>&1 || exit 1"],
         "interval": 30,
         "timeout": 10,
         "retries": 3,

diff --git a/apps/api/.dockerignore → .dockerignore b/apps/api/.dockerignore → .dockerignore
@@ -2,6 +2,17 @@
 .git
 .gitignore
 .dockerignore
+.github
+.vscode
+
+# Rush temp files
+common/deploy/
+common/temp/
+common/autoinstallers/*/.npmrc
+**/.rush/temp/
+*.lock
+*.log
+*.chunks.jsonl
 
 # Build dependencies
 dist

diff --git a/.github/workflows/deploy-api-base.yml b/.github/workflows/deploy-api-base.yml
@@ -28,15 +28,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Create Sentry release
-        uses: getsentry/action-release@v1
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: refly-ai
-          SENTRY_PROJECT: reflyd
-        with:
-          environment: ${{ inputs.environment }}
-
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -55,7 +46,7 @@ jobs:
         env:
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t $ECR_REPOSITORY:$IMAGE_TAG apps/api
+          docker build -t $ECR_REPOSITORY:$IMAGE_TAG -f apps/api/Dockerfile .
           docker push $ECR_REPOSITORY:$IMAGE_TAG
           echo "image=$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
 
@@ -75,3 +66,12 @@ jobs:
           service: ${{ inputs.ecs-service }}
           cluster: ${{ inputs.ecs-cluster }}
           wait-for-service-stability: true
+
+      - name: Create Sentry release
+        uses: getsentry/action-release@v1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: refly-ai
+          SENTRY_PROJECT: reflyd
+        with:
+          environment: ${{ inputs.environment }}
diff --git a/.github/workflows/deploy-api-prod.yml b/.github/workflows/deploy-api-prod.yml
@@ -1,11 +1,11 @@
 name: Deploy API To Prod
 
 on:
-  # push:
-  #   branches:
-  #     - release
-  #   paths:
-  #     - 'apps/api/**'
+  push:
+    branches:
+      - release
+    paths:
+      - 'apps/api/**'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/deploy-api-staging.yml b/.github/workflows/deploy-api-staging.yml
@@ -1,11 +1,11 @@
 name: Deploy API To Staging
 
 on:
-  # push:
-  #   branches-ignore:
-  #     - release
-  #   paths:
-  #     - 'apps/api/**'
+  push:
+    branches-ignore:
+      - release
+    paths:
+      - 'apps/api/**'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/deploy-web-base.yml b/.github/workflows/deploy-web-base.yml
@@ -20,23 +20,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Create Sentry release
-        uses: getsentry/action-release@v1
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: refly-ai
-          SENTRY_PROJECT: web
+      - uses: pnpm/action-setup@v2
         with:
-          environment: ${{ inputs.environment }}
+          version: 8
 
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '20.x'
-          cache: 'pnpm'
 
-      - name: Build
-        run: pnpm install && pnpm --filter '@refly/web' build
+      - name: Set cache env
+        uses: gigara/rush-cache@v2
+
+      - name: Rush Install
+        run: node common/scripts/install-run-rush.js install
+
+      - name: Rush Build
+        run: node common/scripts/install-run-rush.js build
 
       - name: Publish to Cloudflare Pages
         uses: cloudflare/pages-action@v1
@@ -47,3 +47,12 @@ jobs:
           branch: main # always main, to ensure production deployment
           workingDirectory: apps/web
           directory: dist
+
+      - name: Create Sentry release
+        uses: getsentry/action-release@v1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: refly-ai
+          SENTRY_PROJECT: web
+        with:
+          environment: ${{ inputs.environment }}
diff --git a/.github/workflows/deploy-web-prod.yml b/.github/workflows/deploy-web-prod.yml
@@ -1,11 +1,11 @@
 name: Deploy Web To Prod
 
 on:
-  # push:
-  #   branches:
-  #     - release
-  #   paths:
-  #     - 'apps/web/**'
+  push:
+    branches:
+      - release
+    paths:
+      - 'apps/web/**'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/deploy-web-staging.yml b/.github/workflows/deploy-web-staging.yml
@@ -1,11 +1,11 @@
 name: Deploy Web To Staging
 
 on:
-  # push:
-  #   branches-ignore:
-  #     - release
-  #   paths:
-  #     - 'apps/web/**'
+  push:
+    branches-ignore:
+      - release
+    paths:
+      - 'apps/web/**'
   workflow_dispatch:
 
 jobs:

diff --git a/aero/.gitignore b/aero/.gitignore
diff --git a/aero/Makefile b/aero/Makefile
diff --git a/aero/aero_pb2.py b/aero/aero_pb2.py