mirror of https://github.com/buster-so/buster.git
Merge remote-tracking branch 'origin/staging' into github-oauth-apis
This commit is contained in:
commit
1366198fb6
|
@ -32,17 +32,15 @@ jobs:
|
||||||
uses: useblacksmith/setup-node@v5
|
uses: useblacksmith/setup-node@v5
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
|
cache: 'pnpm'
|
||||||
|
|
||||||
- name: Get pnpm store directory
|
- name: Fix pnpm store permissions
|
||||||
shell: bash
|
|
||||||
run: |
|
run: |
|
||||||
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
STORE_PATH=$(pnpm store path --silent)
|
||||||
|
if [ -d "$STORE_PATH" ]; then
|
||||||
- name: Mount pnpm store sticky disk
|
sudo chown -R $(whoami):$(whoami) "$STORE_PATH" || true
|
||||||
uses: useblacksmith/stickydisk@v1
|
chmod -R u+rw "$STORE_PATH" || true
|
||||||
with:
|
fi
|
||||||
key: ${{ github.repository }}-pnpm-store
|
|
||||||
path: ${{ env.STORE_PATH }}
|
|
||||||
|
|
||||||
- name: Check if lockfile changed
|
- name: Check if lockfile changed
|
||||||
id: lockfile-check
|
id: lockfile-check
|
||||||
|
@ -58,10 +56,7 @@ jobs:
|
||||||
run: pnpm fetch --frozen-lockfile
|
run: pnpm fetch --frozen-lockfile
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: pnpm install --frozen-lockfile --prefer-offline
|
||||||
# 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 job - runs in parallel
|
||||||
build:
|
build:
|
||||||
|
|
|
@ -20,26 +20,24 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: useblacksmith/setup-node@v5
|
|
||||||
with:
|
|
||||||
node-version: 22
|
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
uses: pnpm/action-setup@v2
|
uses: pnpm/action-setup@v2
|
||||||
with:
|
with:
|
||||||
version: 9.15.0
|
version: 9.15.0
|
||||||
|
|
||||||
- name: Get pnpm store directory
|
- name: Setup Node.js
|
||||||
shell: bash
|
uses: useblacksmith/setup-node@v5
|
||||||
run: |
|
|
||||||
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Mount pnpm store sticky disk
|
|
||||||
uses: useblacksmith/stickydisk@v1
|
|
||||||
with:
|
with:
|
||||||
key: ${{ github.repository }}-pnpm-store
|
node-version: 22
|
||||||
path: ${{ env.STORE_PATH }}
|
cache: 'pnpm'
|
||||||
|
|
||||||
|
- name: Fix pnpm store permissions
|
||||||
|
run: |
|
||||||
|
STORE_PATH=$(pnpm store path --silent)
|
||||||
|
if [ -d "$STORE_PATH" ]; then
|
||||||
|
sudo chown -R $(whoami):$(whoami) "$STORE_PATH" || true
|
||||||
|
chmod -R u+rw "$STORE_PATH" || true
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Mount Turbo cache sticky disk
|
- name: Mount Turbo cache sticky disk
|
||||||
uses: useblacksmith/stickydisk@v1
|
uses: useblacksmith/stickydisk@v1
|
||||||
|
@ -48,10 +46,7 @@ jobs:
|
||||||
path: ./.turbo
|
path: ./.turbo
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: pnpm install --frozen-lockfile --prefer-offline
|
||||||
# Remove any existing node_modules to avoid conflicts
|
|
||||||
rm -rf node_modules
|
|
||||||
pnpm install --frozen-lockfile --prefer-offline
|
|
||||||
|
|
||||||
- name: Run migrations
|
- name: Run migrations
|
||||||
run: pnpm run db:migrate
|
run: pnpm run db:migrate
|
||||||
|
|
|
@ -40,33 +40,25 @@ jobs:
|
||||||
uses: useblacksmith/setup-node@v5
|
uses: useblacksmith/setup-node@v5
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
|
cache: 'pnpm'
|
||||||
|
|
||||||
|
- name: Fix pnpm store permissions
|
||||||
|
run: |
|
||||||
|
STORE_PATH=$(pnpm store path --silent)
|
||||||
|
if [ -d "$STORE_PATH" ]; then
|
||||||
|
sudo chown -R $(whoami):$(whoami) "$STORE_PATH" || true
|
||||||
|
chmod -R u+rw "$STORE_PATH" || true
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Install bun
|
- name: Install bun
|
||||||
run: npm install -g bun@1.2.15
|
run: npm install -g bun@1.2.15
|
||||||
|
|
||||||
- name: Get pnpm store directory
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Mount pnpm store sticky disk
|
|
||||||
uses: useblacksmith/stickydisk@v1
|
|
||||||
with:
|
|
||||||
key: ${{ github.repository }}-pnpm-store
|
|
||||||
path: ${{ env.STORE_PATH }}
|
|
||||||
|
|
||||||
- name: Mount Turbo cache sticky disk
|
- name: Mount Turbo cache sticky disk
|
||||||
uses: useblacksmith/stickydisk@v1
|
uses: useblacksmith/stickydisk@v1
|
||||||
with:
|
with:
|
||||||
key: ${{ github.repository }}-turbo-cache
|
key: ${{ github.repository }}-turbo-cache
|
||||||
path: ./.turbo
|
path: ./.turbo
|
||||||
|
|
||||||
- name: Mount npm cache sticky disk
|
|
||||||
uses: useblacksmith/stickydisk@v1
|
|
||||||
with:
|
|
||||||
key: ${{ github.repository }}-npm-cache
|
|
||||||
path: ~/.npm
|
|
||||||
|
|
||||||
- name: Mount Docker buildkit sticky disk
|
- name: Mount Docker buildkit sticky disk
|
||||||
uses: useblacksmith/stickydisk@v1
|
uses: useblacksmith/stickydisk@v1
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -17,26 +17,24 @@ jobs:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: useblacksmith/setup-node@v5
|
|
||||||
with:
|
|
||||||
node-version: 22
|
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
uses: pnpm/action-setup@v2
|
uses: pnpm/action-setup@v2
|
||||||
with:
|
with:
|
||||||
version: 9.15.0
|
version: 9.15.0
|
||||||
|
|
||||||
- name: Get pnpm store directory
|
- name: Setup Node.js
|
||||||
shell: bash
|
uses: useblacksmith/setup-node@v5
|
||||||
run: |
|
|
||||||
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Mount pnpm store sticky disk
|
|
||||||
uses: useblacksmith/stickydisk@v1
|
|
||||||
with:
|
with:
|
||||||
key: ${{ github.repository }}-pnpm-store
|
node-version: 22
|
||||||
path: ${{ env.STORE_PATH }}
|
cache: 'pnpm'
|
||||||
|
|
||||||
|
- name: Fix pnpm store permissions
|
||||||
|
run: |
|
||||||
|
STORE_PATH=$(pnpm store path --silent)
|
||||||
|
if [ -d "$STORE_PATH" ]; then
|
||||||
|
sudo chown -R $(whoami):$(whoami) "$STORE_PATH" || true
|
||||||
|
chmod -R u+rw "$STORE_PATH" || true
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Mount Turbo cache sticky disk
|
- name: Mount Turbo cache sticky disk
|
||||||
uses: useblacksmith/stickydisk@v1
|
uses: useblacksmith/stickydisk@v1
|
||||||
|
@ -45,10 +43,7 @@ jobs:
|
||||||
path: ./.turbo
|
path: ./.turbo
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: pnpm install --frozen-lockfile --prefer-offline
|
||||||
# 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' }}
|
- name: 🚀 Deploy to ${{ github.ref_name == 'main' && 'Production' || 'Staging' }}
|
||||||
env:
|
env:
|
||||||
|
|
Loading…
Reference in New Issue