From 8a77f22fbc702ad85f5543eb47a4cf6006daa5bb Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:01:22 -0300 Subject: [PATCH 1/9] remove tailwind cache disable --- turbo.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/turbo.json b/turbo.json index 23f0ff815e..3812750a17 100644 --- a/turbo.json +++ b/turbo.json @@ -36,10 +36,6 @@ "test": { "dependsOn": ["^build"] }, - "@react-email/tailwind#test": { - "dependsOn": ["build"], - "cache": false - }, "test:watch": { "cache": false }, From 77ba11fb1980b24adea93afdfb1b63a0a54157fb Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:10:08 -0300 Subject: [PATCH 2/9] merge build and test workflows --- .github/workflows/tests.yml | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 45b6a5846c..fcb1d2901d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,8 @@ permissions: contents: read pull-requests: read jobs: - build: + build-and-test: + name: build and test runs-on: buildjet-4vcpu-ubuntu-2204 outputs: cache-hit: ${{ steps.pnpm-cache.outputs.cache-hit }} @@ -51,37 +52,6 @@ jobs: - name: Run Build run: pnpm build - test: - runs-on: buildjet-4vcpu-ubuntu-2204 - needs: [build] - container: - image: node:22 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup pnpm - run: | - corepack enable - corepack prepare pnpm@9.15.0 --activate - - - name: Restore dependencies - uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 - with: - path: | - ~/.pnpm-store - node_modules - */*/node_modules - key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} - - - name: turborepo Cache - uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 - with: - path: | - .turbo - key: ${{ runner.os }}-turbo-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-turbo- - name: Run Tests run: pnpm test From 4be90d4967ff09190216dcdcfa110b9750b1fcf6 Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:19:33 -0300 Subject: [PATCH 3/9] fix pnpm install being ran even when cache was hit --- .github/workflows/lint.yml | 1 + .github/workflows/tests.yml | 1 + .github/workflows/version.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f066891ee2..3970186f5e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,6 +18,7 @@ jobs: - name: pnpm setup uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda - name: pnpm Cache + id: pnpm-cache uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 with: path: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fcb1d2901d..2fac53b577 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,6 +27,7 @@ jobs: pnpm config set script-shell "/usr/bin/bash" - name: pnpm Cache + id: pnpm-cache uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 with: path: | diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 4078cd426b..2c566febea 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -35,6 +35,7 @@ jobs: pnpm config set script-shell "/usr/bin/bash" - name: pnpm Cache + id: pnpm-cache uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 with: path: | From bc596a3de5e92dd6a0155123cb4e4770df02ce9a Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:20:12 -0300 Subject: [PATCH 4/9] use pnpm setup action which is faster than manually running corepack --- .github/workflows/tests.yml | 8 ++------ .github/workflows/version.yml | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2fac53b577..1d6d07ce03 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,12 +19,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Enable Corepack - id: pnpm-setup - run: | - corepack enable - corepack prepare pnpm@9.15.0 --activate - pnpm config set script-shell "/usr/bin/bash" + - name: pnpm setup + uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda - name: pnpm Cache id: pnpm-cache diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 2c566febea..c3b2c4bb36 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -27,12 +27,8 @@ jobs: with: node-version: 22 - - name: Enable Corepack - id: pnpm-setup - run: | - corepack enable - corepack prepare pnpm@9.15.0 --activate - pnpm config set script-shell "/usr/bin/bash" + - name: pnpm setup + uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda - name: pnpm Cache id: pnpm-cache From 566316fad77a859defd0fe759077383afba414ef Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:29:35 -0300 Subject: [PATCH 5/9] try adding envs for build step --- .github/workflows/tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1d6d07ce03..e25fcd0285 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,6 +49,11 @@ jobs: - name: Run Build run: pnpm build + # We include the environment variables here so that the cache for turborepo + # is not invalidated and builds are re-ran + env: + SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }} + SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }} - name: Run Tests run: pnpm test From 628600344a1745843c4a7adb5584767e964c318e Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:29:55 -0300 Subject: [PATCH 6/9] remove spaces between steps --- .github/workflows/tests.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e25fcd0285..21ed1b622c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,10 +18,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: pnpm setup uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda - - name: pnpm Cache id: pnpm-cache uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 @@ -33,11 +31,9 @@ jobs: key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-pnpm- - - name: Install packages if: steps.pnpm-cache.outputs.cache-hit != 'true' run: pnpm install --frozen-lockfile - - name: turborepo Cache uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 with: @@ -46,7 +42,6 @@ jobs: key: ${{ runner.os }}-turbo-${{ github.sha }} restore-keys: | ${{ runner.os }}-turbo- - - name: Run Build run: pnpm build # We include the environment variables here so that the cache for turborepo @@ -54,13 +49,11 @@ jobs: env: SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }} SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }} - - name: Run Tests run: pnpm test env: SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }} SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }} - dependencies: runs-on: buildjet-4vcpu-ubuntu-2204 container: @@ -68,6 +61,5 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Check for pinned dependencies run: npx tsx ./scripts/check-dependency-versions.ts From 21d8296543a121e2f4d2e2fabc462fc15de2c903 Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 10:47:43 -0300 Subject: [PATCH 7/9] add pnpm-lock to global dependencies --- turbo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turbo.json b/turbo.json index 3812750a17..1b8fd94177 100644 --- a/turbo.json +++ b/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "globalDependencies": ["**/.env.*local"], + "globalDependencies": ["**/.env.*local", "pnpm-lock.yaml"], "globalEnv": [ "SUPABASE_URL", "SUPABASE_ANON_KEY", From e6afa86789dc143ca60b9cdfd3d60e1b5574ed48 Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 11:02:45 -0300 Subject: [PATCH 8/9] pointless change to run cold CI --- package.json | 2 +- packages/react-email/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3d6c2918e1..c886e989ce 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "tsconfig": "workspace:*", "tsup": "8.2.4", "turbo": "2.3.1", - "vite": "5.4.14", + "vite": "^5.4.14", "vitest": "3.1.1" }, "pnpm": { diff --git a/packages/react-email/package.json b/packages/react-email/package.json index 8621f86778..67f195b45c 100644 --- a/packages/react-email/package.json +++ b/packages/react-email/package.json @@ -35,7 +35,7 @@ "glob": "10.3.4", "log-symbols": "4.1.0", "mime-types": "2.1.35", - "next": "15.2.4", + "next": "^15.2.4", "normalize-path": "3.0.0", "ora": "5.4.1", "socket.io": "4.8.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c53d497a29..bb0e0d80ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,7 +48,7 @@ importers: specifier: 2.3.1 version: 2.3.1 vite: - specifier: 5.4.14 + specifier: ^5.4.14 version: 5.4.14(@types/node@22.10.2)(terser@5.37.0) vitest: specifier: 3.1.1 @@ -676,7 +676,7 @@ importers: specifier: 2.1.35 version: 2.1.35 next: - specifier: 15.2.4 + specifier: ^15.2.4 version: 15.2.4(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) normalize-path: specifier: 3.0.0 From 5244c4452825a20a737438bac4014cd31bfef91a Mon Sep 17 00:00:00 2001 From: gabriel miranda Date: Thu, 24 Apr 2025 11:08:50 -0300 Subject: [PATCH 9/9] Revert "pointless change to run cold CI" This reverts commit e6afa86789dc143ca60b9cdfd3d60e1b5574ed48. --- package.json | 2 +- packages/react-email/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c886e989ce..3d6c2918e1 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "tsconfig": "workspace:*", "tsup": "8.2.4", "turbo": "2.3.1", - "vite": "^5.4.14", + "vite": "5.4.14", "vitest": "3.1.1" }, "pnpm": { diff --git a/packages/react-email/package.json b/packages/react-email/package.json index 67f195b45c..8621f86778 100644 --- a/packages/react-email/package.json +++ b/packages/react-email/package.json @@ -35,7 +35,7 @@ "glob": "10.3.4", "log-symbols": "4.1.0", "mime-types": "2.1.35", - "next": "^15.2.4", + "next": "15.2.4", "normalize-path": "3.0.0", "ora": "5.4.1", "socket.io": "4.8.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb0e0d80ca..c53d497a29 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,7 +48,7 @@ importers: specifier: 2.3.1 version: 2.3.1 vite: - specifier: ^5.4.14 + specifier: 5.4.14 version: 5.4.14(@types/node@22.10.2)(terser@5.37.0) vitest: specifier: 3.1.1 @@ -676,7 +676,7 @@ importers: specifier: 2.1.35 version: 2.1.35 next: - specifier: ^15.2.4 + specifier: 15.2.4 version: 15.2.4(@babel/core@7.26.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) normalize-path: specifier: 3.0.0