Merge pull request #1482 from simstudioai/revert-1424-staging

Revert "v0.3.59: billing fixes, undo/redo, changelog, translations, start block deprecation, copilot refactor, deployment versioning, google vault"

Author: icecrasher321

.github/workflows/build.yml

@@ -0,0 +1,151 @@
+name: Build and Publish Docker Image
+
+on:
+  push:
+    branches: [main, staging]
+
+jobs:
+  build-and-push:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # AMD64 builds on x86 runners
+          - dockerfile: ./docker/app.Dockerfile
+            image: ghcr.io/simstudioai/simstudio
+            platform: linux/amd64
+            arch: amd64
+            runner: linux-x64-8-core
+          - dockerfile: ./docker/db.Dockerfile
+            image: ghcr.io/simstudioai/migrations
+            platform: linux/amd64
+            arch: amd64
+            runner: linux-x64-8-core
+          - dockerfile: ./docker/realtime.Dockerfile
+            image: ghcr.io/simstudioai/realtime
+            platform: linux/amd64
+            arch: amd64
+            runner: linux-x64-8-core
+          # ARM64 builds on native ARM64 runners
+          - dockerfile: ./docker/app.Dockerfile
+            image: ghcr.io/simstudioai/simstudio
+            platform: linux/arm64
+            arch: arm64
+            runner: linux-arm64-8-core
+          - dockerfile: ./docker/db.Dockerfile
+            image: ghcr.io/simstudioai/migrations
+            platform: linux/arm64
+            arch: arm64
+            runner: linux-arm64-8-core
+          - dockerfile: ./docker/realtime.Dockerfile
+            image: ghcr.io/simstudioai/realtime
+            platform: linux/arm64
+            arch: arm64
+            runner: linux-arm64-8-core
+    runs-on: ${{ matrix.runner }}
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ matrix.image }}
+          tags: |
+            type=raw,value=latest-${{ matrix.arch }},enable=${{ github.ref == 'refs/heads/main' }}
+            type=raw,value=staging-${{ github.sha }}-${{ matrix.arch }},enable=${{ github.ref == 'refs/heads/staging' }}
+            type=sha,format=long,suffix=-${{ matrix.arch }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          platforms: ${{ matrix.platform }}
+          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=build-v3
+          cache-to: type=gha,mode=max,scope=build-v3
+          provenance: false
+          sbom: false
+
+  create-manifests:
+    runs-on: ubuntu-latest
+    needs: build-and-push
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+    strategy:
+      matrix:
+        include:
+          - image: ghcr.io/simstudioai/simstudio
+          - image: ghcr.io/simstudioai/migrations
+          - image: ghcr.io/simstudioai/realtime
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for manifest
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ matrix.image }}
+          tags: |
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+            type=sha,format=long
+
+      - name: Create and push manifest
+        run: |
+          # Extract the tags from metadata (these are the final manifest tags we want)
+          MANIFEST_TAGS="${{ steps.meta.outputs.tags }}"
+
+          # Create manifest for each tag
+          for manifest_tag in $MANIFEST_TAGS; do
+            echo "Creating manifest for $manifest_tag"
+
+            # The architecture-specific images have -amd64 and -arm64 suffixes
+            amd64_image="${manifest_tag}-amd64"
+            arm64_image="${manifest_tag}-arm64"
+
+            echo "Looking for images: $amd64_image and $arm64_image"
+
+            # Check if both architecture images exist
+            if docker manifest inspect "$amd64_image" >/dev/null 2>&1 && docker manifest inspect "$arm64_image" >/dev/null 2>&1; then
+              echo "Both images found, creating manifest..."
+              docker manifest create "$manifest_tag" \
+                "$amd64_image" \
+                "$arm64_image"
+              docker manifest push "$manifest_tag"
+              echo "Successfully created and pushed manifest for $manifest_tag"
+            else
+              echo "Error: One or both architecture images not found"
+              echo "Checking AMD64 image: $amd64_image"
+              docker manifest inspect "$amd64_image" || echo "AMD64 image not found"
+              echo "Checking ARM64 image: $arm64_image"
+              docker manifest inspect "$arm64_image" || echo "ARM64 image not found"
+              exit 1
+            fi
+          done

.github/workflows/ci.yml

@@ -6,53 +6,74 @@ on:
   pull_request:
     branches: [main, staging]
 
-concurrency:
-  group: ci-${{ github.ref }}
-  cancel-in-progress: false
-
 jobs:
-  test-build:
+  test:
     name: Test and Build
-    uses: ./.github/workflows/test-build.yml
-    secrets: inherit
+    runs-on: ubuntu-latest
 
-  # Build and push images (ECR for staging, ECR + GHCR for main)
-  build-images:
-    name: Build Images
-    needs: test-build
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
-    uses: ./.github/workflows/images.yml
-    secrets: inherit
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-
-  # Deploy Trigger.dev (after builds complete)
-  trigger-deploy:
-    name: Deploy Trigger.dev
-    needs: build-images
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
-    uses: ./.github/workflows/trigger-deploy.yml
-    secrets: inherit
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Run tests with coverage
+        env:
+          NODE_OPTIONS: '--no-warnings'
+          NEXT_PUBLIC_APP_URL: 'https://www.sim.ai'
+          DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/simstudio'
+          ENCRYPTION_KEY: '7cf672e460e430c1fba707575c2b0e2ad5a99dddf9b7b7e3b5646e630861db1c' # dummy key for CI only
+        run: bun run test
+
+      - name: Build application
+        env:
+          NODE_OPTIONS: '--no-warnings'
+          NEXT_PUBLIC_APP_URL: 'https://www.sim.ai'
+          DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/simstudio'
+          STRIPE_SECRET_KEY: 'dummy_key_for_ci_only'
+          STRIPE_WEBHOOK_SECRET: 'dummy_secret_for_ci_only'
+          RESEND_API_KEY: 'dummy_key_for_ci_only'
+          AWS_REGION: 'us-west-2'
+          ENCRYPTION_KEY: '7cf672e460e430c1fba707575c2b0e2ad5a99dddf9b7b7e3b5646e630861db1c' # dummy key for CI only
+        run: bun run build
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          directory: ./apps/sim/coverage
+          fail_ci_if_error: false
+          verbose: true
 
-  # Run database migrations (depends on build completion and trigger deployment)
   migrations:
     name: Apply Database Migrations
-    needs: [build-images, trigger-deploy]
-    if: |
-      always() &&
-      github.event_name == 'push' &&
-      (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging') &&
-      needs.build-images.result == 'success' &&
-      needs.trigger-deploy.result == 'success'
-    uses: ./.github/workflows/migrations.yml
-    secrets: inherit
-
-  # Process docs embeddings if needed
-  process-docs:
-    name: Process Docs
-    needs: migrations
+    runs-on: ubuntu-latest
     if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
-    uses: ./.github/workflows/docs-embeddings.yml
-    secrets: inherit
+    needs: test
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: Apply migrations
+        working-directory: ./packages/db
+        env:
+          DATABASE_URL: ${{ github.ref == 'refs/heads/main' && secrets.DATABASE_URL || secrets.STAGING_DATABASE_URL }}
+        run: bunx drizzle-kit migrate --config=./drizzle.config.ts

.github/workflows/docs-embeddings.yml

@@ -1,13 +1,16 @@
 name: Process Docs Embeddings
 
 on:
-  workflow_call:
+  push:
+    branches: [main, staging]
+    paths:
+      - 'apps/docs/**'
   workflow_dispatch: # Allow manual triggering
 
 jobs:
   process-docs-embeddings:
     name: Process Documentation Embeddings
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging'
 
     steps:

.github/workflows/i18n.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   translate:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     if: github.actor != 'github-actions[bot]' # Prevent infinite loops
 
     steps:
@@ -55,7 +55,7 @@ jobs:
         with:
           token: ${{ secrets.GH_PAT }}
           commit-message: "feat(i18n): update translations"
-          title: "feat(i18n): update translations"
+          title: "🌐 Auto-update translations"
           body: |
             ## Summary
             Automated translation updates triggered by changes to documentation.
@@ -76,10 +76,8 @@ jobs:
             ## Testing
             This PR includes automated translations for modified English documentation content:
             - 🇪🇸 Spanish (es) translations
-            - 🇫🇷 French (fr) translations
+            - 🇫🇷 French (fr) translations  
             - 🇨🇳 Chinese (zh) translations
-            - 🇯🇵 Japanese (ja) translations
-            - 🇩🇪 German (de) translations
             
             **What reviewers should focus on:**
             - Verify translated content accuracy and context
@@ -104,7 +102,7 @@ jobs:
 
   verify-translations:
     needs: translate
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     if: always() # Run even if translation fails
 
     steps:
@@ -139,21 +137,15 @@ jobs:
           es_count=$(find content/docs/es -name "*.mdx" 2>/dev/null | wc -l || echo 0)
           fr_count=$(find content/docs/fr -name "*.mdx" 2>/dev/null | wc -l || echo 0)
           zh_count=$(find content/docs/zh -name "*.mdx" 2>/dev/null | wc -l || echo 0)
-          ja_count=$(find content/docs/ja -name "*.mdx" 2>/dev/null | wc -l || echo 0)
-          de_count=$(find content/docs/de -name "*.mdx" 2>/dev/null | wc -l || echo 0)
           
           es_percentage=$((es_count * 100 / en_count))
           fr_percentage=$((fr_count * 100 / en_count))
           zh_percentage=$((zh_count * 100 / en_count))
-          ja_percentage=$((ja_count * 100 / en_count))
-          de_percentage=$((de_count * 100 / en_count))
           
           echo "### Coverage Statistics" >> $GITHUB_STEP_SUMMARY
           echo "- **🇬🇧 English**: $en_count files (source)" >> $GITHUB_STEP_SUMMARY
           echo "- **🇪🇸 Spanish**: $es_count/$en_count files ($es_percentage%)" >> $GITHUB_STEP_SUMMARY
           echo "- **🇫🇷 French**: $fr_count/$en_count files ($fr_percentage%)" >> $GITHUB_STEP_SUMMARY
           echo "- **🇨🇳 Chinese**: $zh_count/$en_count files ($zh_percentage%)" >> $GITHUB_STEP_SUMMARY
-          echo "- **🇯🇵 Japanese**: $ja_count/$en_count files ($ja_percentage%)" >> $GITHUB_STEP_SUMMARY
-          echo "- **🇩🇪 German**: $de_count/$en_count files ($de_percentage%)" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "🔄 **Auto-translation PR**: Check for new pull request with updated translations" >> $GITHUB_STEP_SUMMARY