From f7e6f4f4087a5593120eb86488fede4b8d4b140f Mon Sep 17 00:00:00 2001 From: dal Date: Tue, 19 Aug 2025 13:42:05 -0600 Subject: [PATCH] caching updates --- .github/workflows/ci.yml | 47 ++++++++--------------- .github/workflows/database-migrations.yml | 11 ++---- .github/workflows/trigger-deployment.yml | 11 ++---- 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fdfe6490..32243e42d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,12 +44,6 @@ jobs: key: ${{ github.repository }}-pnpm-store path: ${{ env.STORE_PATH }} - - name: Mount node_modules sticky disk - uses: useblacksmith/stickydisk@v1 - with: - key: ${{ github.repository }}-pr-${{ github.event.pull_request.number }}-node-modules - path: ./node_modules - - name: Check if lockfile changed id: lockfile-check run: | @@ -64,7 +58,10 @@ jobs: run: pnpm fetch --frozen-lockfile - name: Install dependencies - run: pnpm install --frozen-lockfile --prefer-offline + run: | + # Clean install from pnpm store (already cached in sticky disk) + rm -rf node_modules + pnpm install --frozen-lockfile --prefer-offline # Build job - runs in parallel build: @@ -97,20 +94,16 @@ jobs: key: ${{ github.repository }}-pnpm-store path: ${{ env.STORE_PATH }} - - name: Mount node_modules sticky disk - uses: useblacksmith/stickydisk@v1 - with: - key: ${{ github.repository }}-pr-${{ github.event.pull_request.number }}-node-modules - path: ./node_modules - - name: Mount Turbo cache sticky disk uses: useblacksmith/stickydisk@v1 with: key: ${{ github.repository }}-turbo-cache path: ./.turbo - - name: Install dependencies (from sticky disk) - run: pnpm install --frozen-lockfile --prefer-offline + - name: Install dependencies + run: | + rm -rf node_modules + pnpm install --frozen-lockfile --prefer-offline - name: Build all packages (excluding web) run: pnpm build --filter='!@buster-app/web' @@ -148,20 +141,16 @@ jobs: key: ${{ github.repository }}-pnpm-store path: ${{ env.STORE_PATH }} - - name: Mount node_modules sticky disk - uses: useblacksmith/stickydisk@v1 - with: - key: ${{ github.repository }}-pr-${{ github.event.pull_request.number }}-node-modules - path: ./node_modules - - name: Mount Turbo cache sticky disk uses: useblacksmith/stickydisk@v1 with: key: ${{ github.repository }}-turbo-cache path: ./.turbo - - name: Install dependencies (from sticky disk) - run: pnpm install --frozen-lockfile --prefer-offline + - name: Install dependencies + run: | + rm -rf node_modules + pnpm install --frozen-lockfile --prefer-offline - name: Lint all packages (excluding web) run: pnpm lint --filter='!@buster-app/web' @@ -197,20 +186,16 @@ jobs: key: ${{ github.repository }}-pnpm-store path: ${{ env.STORE_PATH }} - - name: Mount node_modules sticky disk - uses: useblacksmith/stickydisk@v1 - with: - key: ${{ github.repository }}-pr-${{ github.event.pull_request.number }}-node-modules - path: ./node_modules - - name: Mount Turbo cache sticky disk uses: useblacksmith/stickydisk@v1 with: key: ${{ github.repository }}-turbo-cache path: ./.turbo - - name: Install dependencies (from sticky disk) - run: pnpm install --frozen-lockfile --prefer-offline + - name: Install dependencies + run: | + rm -rf node_modules + pnpm install --frozen-lockfile --prefer-offline - name: Run all unit tests (excluding web) run: pnpm test:unit --filter='!@buster-app/web' diff --git a/.github/workflows/database-migrations.yml b/.github/workflows/database-migrations.yml index 12deddace..21f568acc 100644 --- a/.github/workflows/database-migrations.yml +++ b/.github/workflows/database-migrations.yml @@ -41,12 +41,6 @@ jobs: key: ${{ github.repository }}-pnpm-store path: ${{ env.STORE_PATH }} - - name: Mount node_modules sticky disk - uses: useblacksmith/stickydisk@v1 - with: - key: ${{ github.repository }}-${{ github.ref_name }}-db-node-modules - path: ./node_modules - - name: Mount Turbo cache sticky disk uses: useblacksmith/stickydisk@v1 with: @@ -54,7 +48,10 @@ jobs: path: ./.turbo - name: Install dependencies - run: pnpm install --frozen-lockfile --prefer-offline + run: | + # Remove any existing node_modules to avoid conflicts + rm -rf node_modules + pnpm install --frozen-lockfile --prefer-offline - name: Run migrations run: pnpm run db:migrate diff --git a/.github/workflows/trigger-deployment.yml b/.github/workflows/trigger-deployment.yml index 4ce10cba1..23ba2663d 100644 --- a/.github/workflows/trigger-deployment.yml +++ b/.github/workflows/trigger-deployment.yml @@ -38,12 +38,6 @@ jobs: key: ${{ github.repository }}-pnpm-store path: ${{ env.STORE_PATH }} - - name: Mount node_modules sticky disk - uses: useblacksmith/stickydisk@v1 - with: - key: ${{ github.repository }}-${{ github.ref_name }}-trigger-node-modules - path: ./node_modules - - name: Mount Turbo cache sticky disk uses: useblacksmith/stickydisk@v1 with: @@ -51,7 +45,10 @@ jobs: path: ./.turbo - name: Install dependencies - run: pnpm install --frozen-lockfile --prefer-offline + run: | + # Remove any existing node_modules to avoid conflicts + rm -rf node_modules + pnpm install --frozen-lockfile --prefer-offline - name: 🚀 Deploy to ${{ github.ref_name == 'main' && 'Production' || 'Staging' }} env: