From e52a74369ee0b2d53ac1bf36047d1516014fe470 Mon Sep 17 00:00:00 2001 From: Michael Preuss Date: Sun, 25 Jan 2026 11:48:25 -0800 Subject: [PATCH 1/2] Add quality checks to marketing site deployment workflows --- .github/workflows/website-deploy.yml | 27 +++++++++++++++++++++++++-- .github/workflows/website-preview.yml | 27 +++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 20eea4288a9..f7ea7a30390 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -8,6 +8,10 @@ on: - 'apps/web-roo-code/**' workflow_dispatch: +concurrency: + group: deploy-roocode-com + cancel-in-progress: true + env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} @@ -27,17 +31,36 @@ jobs: echo "has-vercel-token=false" >> $GITHUB_OUTPUT fi - deploy: + quality-checks: runs-on: ubuntu-latest needs: check-secrets if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} + defaults: + run: + working-directory: apps/web-roo-code + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Setup Node.js and pnpm + uses: ./.github/actions/setup-node-pnpm + - name: Run lint + run: pnpm run lint + - name: Run type check + run: pnpm run check-types + - name: Run build + run: pnpm run build + + deploy: + runs-on: ubuntu-latest + needs: [check-secrets, quality-checks] + if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} steps: - name: Checkout code uses: actions/checkout@v4 - name: Setup Node.js and pnpm uses: ./.github/actions/setup-node-pnpm - name: Install Vercel CLI - run: npm install --global vercel@canary + run: npm install --global vercel@latest - name: Pull Vercel Environment Information run: npx vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts diff --git a/.github/workflows/website-preview.yml b/.github/workflows/website-preview.yml index 65cf3e54189..6426d9ed3fb 100644 --- a/.github/workflows/website-preview.yml +++ b/.github/workflows/website-preview.yml @@ -11,6 +11,10 @@ on: - "apps/web-roo-code/**" workflow_dispatch: +concurrency: + group: preview-roocode-com-${{ github.ref }} + cancel-in-progress: true + env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} @@ -30,17 +34,36 @@ jobs: echo "has-vercel-token=false" >> $GITHUB_OUTPUT fi - preview: + quality-checks: runs-on: ubuntu-latest needs: check-secrets if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} + defaults: + run: + working-directory: apps/web-roo-code + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Setup Node.js and pnpm + uses: ./.github/actions/setup-node-pnpm + - name: Run lint + run: pnpm run lint + - name: Run type check + run: pnpm run check-types + - name: Run build + run: pnpm run build + + preview: + runs-on: ubuntu-latest + needs: [check-secrets, quality-checks] + if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} steps: - name: Checkout code uses: actions/checkout@v4 - name: Setup Node.js and pnpm uses: ./.github/actions/setup-node-pnpm - name: Install Vercel CLI - run: npm install --global vercel@canary + run: npm install --global vercel@latest - name: Pull Vercel Environment Information run: npx vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts From 7ea11ddc0692610e2e4f672ebbdab63333ce914c Mon Sep 17 00:00:00 2001 From: cte Date: Tue, 27 Jan 2026 00:55:35 -0800 Subject: [PATCH 2/2] Simplify ci changes --- .github/workflows/website-deploy.yml | 24 +++++++----------------- .github/workflows/website-preview.yml | 24 +++++++----------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index f7ea7a30390..da2d4228f51 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -31,34 +31,24 @@ jobs: echo "has-vercel-token=false" >> $GITHUB_OUTPUT fi - quality-checks: + deploy: runs-on: ubuntu-latest needs: check-secrets if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} - defaults: - run: - working-directory: apps/web-roo-code steps: - name: Checkout code uses: actions/checkout@v4 - name: Setup Node.js and pnpm uses: ./.github/actions/setup-node-pnpm - name: Run lint - run: pnpm run lint + run: pnpm lint + working-directory: apps/web-roo-code - name: Run type check - run: pnpm run check-types + run: pnpm check-types + working-directory: apps/web-roo-code - name: Run build - run: pnpm run build - - deploy: - runs-on: ubuntu-latest - needs: [check-secrets, quality-checks] - if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Setup Node.js and pnpm - uses: ./.github/actions/setup-node-pnpm + run: pnpm build + working-directory: apps/web-roo-code - name: Install Vercel CLI run: npm install --global vercel@latest - name: Pull Vercel Environment Information diff --git a/.github/workflows/website-preview.yml b/.github/workflows/website-preview.yml index 6426d9ed3fb..9446bc77531 100644 --- a/.github/workflows/website-preview.yml +++ b/.github/workflows/website-preview.yml @@ -34,34 +34,24 @@ jobs: echo "has-vercel-token=false" >> $GITHUB_OUTPUT fi - quality-checks: + preview: runs-on: ubuntu-latest needs: check-secrets if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} - defaults: - run: - working-directory: apps/web-roo-code steps: - name: Checkout code uses: actions/checkout@v4 - name: Setup Node.js and pnpm uses: ./.github/actions/setup-node-pnpm - name: Run lint - run: pnpm run lint + run: pnpm lint + working-directory: apps/web-roo-code - name: Run type check - run: pnpm run check-types + run: pnpm check-types + working-directory: apps/web-roo-code - name: Run build - run: pnpm run build - - preview: - runs-on: ubuntu-latest - needs: [check-secrets, quality-checks] - if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Setup Node.js and pnpm - uses: ./.github/actions/setup-node-pnpm + run: pnpm build + working-directory: apps/web-roo-code - name: Install Vercel CLI run: npm install --global vercel@latest - name: Pull Vercel Environment Information