Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 56a56e590e | |||
| 9a6188b2ae | |||
| fea0585a75 | |||
| 820b1d8d84 | |||
| 48b524ef84 | |||
| e602e83642 | |||
| ac8562ea51 | |||
| b1c4e9a0ce | |||
| 413ebaeaee | |||
| f27efebd82 | |||
| 30ea4e4e86 | |||
| 75cb6ed29d |
@@ -5,14 +5,14 @@ on:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- 'Dockerfile.ci-base'
|
||||
- 'package.json'
|
||||
- 'bun.lock'
|
||||
- '.gitea/workflows/build-ci-images.yml'
|
||||
- "Dockerfile.ci-base"
|
||||
- "package.json"
|
||||
- "bun.lock"
|
||||
- ".gitea/workflows/build-ci-images.yml"
|
||||
schedule:
|
||||
# Weekly rebuild to get latest Playwright/Bun versions
|
||||
- cron: '0 2 * * 0' # Every Sunday at 2 AM
|
||||
workflow_dispatch: # Manual trigger
|
||||
- cron: "0 2 * * 0" # Every Sunday at 2 AM
|
||||
workflow_dispatch: # Manual trigger
|
||||
|
||||
env:
|
||||
REGISTRY: docker.notsosm.art
|
||||
@@ -24,48 +24,45 @@ jobs:
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
|
||||
- name: Login to Registry
|
||||
run: |
|
||||
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} --password-stdin
|
||||
|
||||
|
||||
- name: Extract metadata for CI base image
|
||||
id: meta
|
||||
run: |
|
||||
# Get Playwright version from package.json
|
||||
PLAYWRIGHT_VERSION=$(grep -o '"@playwright/test": "[^"]*"' package.json | cut -d'"' -f4)
|
||||
PLAYWRIGHT_VERSION=$(grep -o '"@playwright/test": "[^"]*"' package.json | cut -d'"' -f4 | sed 's/^\^//')
|
||||
echo "playwright_version=${PLAYWRIGHT_VERSION}" >> $GITHUB_OUTPUT
|
||||
|
||||
|
||||
# Get Bun version (latest)
|
||||
BUN_VERSION=$(bun --version 2>/dev/null || echo "latest")
|
||||
echo "bun_version=${BUN_VERSION}" >> $GITHUB_OUTPUT
|
||||
|
||||
|
||||
# Set tags
|
||||
echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${PLAYWRIGHT_VERSION},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }}" >> $GITHUB_OUTPUT
|
||||
|
||||
|
||||
- name: Build and push CI base image
|
||||
run: |
|
||||
WORKSPACE_DIR="$GITHUB_WORKSPACE"
|
||||
# Build with multiple tags
|
||||
docker build \
|
||||
--file Dockerfile.ci-base \
|
||||
--context "$WORKSPACE_DIR" \
|
||||
--file "$WORKSPACE_DIR/Dockerfile.ci-base" \
|
||||
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest \
|
||||
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }} \
|
||||
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }} \
|
||||
.
|
||||
|
||||
# Push all tags
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }}
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }}
|
||||
|
||||
|
||||
- name: Clean up
|
||||
if: always()
|
||||
run: |
|
||||
docker logout ${{ env.REGISTRY }}
|
||||
docker logout ${{ env.REGISTRY }}
|
||||
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
name: Deploy Production
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version tag to deploy (e.g., v0.1.21)'
|
||||
required: true
|
||||
type: string
|
||||
|
||||
env:
|
||||
REGISTRY: docker.notsosm.art
|
||||
IMAGE_NAME: euchre-camp
|
||||
PROD_APPS_PATH: /apps/youthful_simon
|
||||
|
||||
jobs:
|
||||
deploy-prod:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||
options: --user root
|
||||
|
||||
steps:
|
||||
- name: Deploy to production
|
||||
run: |
|
||||
VERSION="${{ inputs.version }}"
|
||||
COMPOSE_FILE="${{ env.PROD_APPS_PATH }}/docker-compose.yml"
|
||||
|
||||
echo "Deploying ${VERSION} to production..."
|
||||
|
||||
# Update prod compose file with the release tag
|
||||
# Note: Standardizing to docker.notsosm.art registry
|
||||
sed -i "s|image: euchre-camp/euchre-camp:[a-zA-Z0-9.-]*|image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION}|" ${COMPOSE_FILE}
|
||||
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${VERSION}|" ${COMPOSE_FILE}
|
||||
|
||||
# Pull and restart the prod container
|
||||
cd ${{ env.PROD_APPS_PATH }}
|
||||
docker compose pull app
|
||||
docker compose up -d app
|
||||
|
||||
# Wait for production site to be healthy
|
||||
echo "Waiting for production site to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if curl -sf https://euchre.notsosm.art/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Production successfully deployed with version ${VERSION}"
|
||||
exit 0
|
||||
fi
|
||||
sleep 0.5
|
||||
done
|
||||
echo "❌ Production deployment failed"
|
||||
docker compose logs app
|
||||
exit 1
|
||||
@@ -5,6 +5,10 @@ on:
|
||||
branches:
|
||||
- main
|
||||
|
||||
env:
|
||||
REGISTRY: docker.notsosm.art
|
||||
IMAGE_NAME: euchre-camp
|
||||
|
||||
jobs:
|
||||
unit-tests:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -27,6 +31,79 @@ jobs:
|
||||
- name: Run unit tests
|
||||
run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
|
||||
|
||||
build-and-deploy-ci:
|
||||
runs-on: ubuntu-latest
|
||||
needs: unit-tests
|
||||
container:
|
||||
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||
options: --user root
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install dependencies
|
||||
run: bun install
|
||||
|
||||
- name: Generate Prisma client
|
||||
run: bun x prisma generate
|
||||
env:
|
||||
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||
|
||||
- name: Extract PR number and commit info
|
||||
id: info
|
||||
run: |
|
||||
echo "pr_number=$(echo $GITHUB_REF | grep -oP 'refs/pull/\K[0-9]+')" >> $GITHUB_OUTPUT
|
||||
echo "short_sha=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build Docker image for PR
|
||||
run: |
|
||||
WORKSPACE_DIR="$GITHUB_WORKSPACE"
|
||||
IMAGE_TAG="pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }}"
|
||||
docker build \
|
||||
--context "$WORKSPACE_DIR" \
|
||||
--file "$WORKSPACE_DIR/Dockerfile" \
|
||||
--target runner \
|
||||
--build-arg GIT_COMMIT=$GITHUB_SHA \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${IMAGE_TAG} \
|
||||
"$WORKSPACE_DIR"
|
||||
|
||||
- name: Update CI site compose and restart
|
||||
run: |
|
||||
IMAGE_TAG="pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }}"
|
||||
COMPOSE_FILE="/apps/euchre_camp_ci/docker-compose.yml"
|
||||
|
||||
# Update the image tag in the compose file
|
||||
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" ${COMPOSE_FILE}
|
||||
|
||||
# Pull the new image and restart the CI stack
|
||||
cd /apps/euchre_camp_ci
|
||||
docker compose pull app
|
||||
docker compose up -d app
|
||||
|
||||
- name: Wait for CI site to be healthy
|
||||
run: |
|
||||
for i in {1..30}; do
|
||||
if curl -sf https://euchre-ci.notsosm.art/api/health > /dev/null 2>&1; then
|
||||
echo "CI site is healthy"
|
||||
exit 0
|
||||
fi
|
||||
sleep 0.5
|
||||
done
|
||||
echo "CI site failed to become healthy after 15 seconds"
|
||||
docker compose -f /apps/euchre_camp_ci/docker-compose.yml logs app
|
||||
exit 1
|
||||
|
||||
- name: Run acceptance tests
|
||||
run: DATABASE_URL="${{ secrets.CI_DATABASE_URL }}" bun test:acceptance
|
||||
env:
|
||||
CI: true
|
||||
|
||||
- name: Cleanup PR images
|
||||
if: always()
|
||||
run: |
|
||||
docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }} || true
|
||||
|
||||
analyze-bump-type:
|
||||
runs-on: ubuntu-latest
|
||||
needs: unit-tests
|
||||
|
||||
@@ -110,11 +110,14 @@ jobs:
|
||||
- name: Build test-capable image
|
||||
if: steps.commit.outputs.committed == 'true'
|
||||
run: |
|
||||
WORKSPACE_DIR="$GITHUB_WORKSPACE"
|
||||
docker build \
|
||||
--context "$WORKSPACE_DIR" \
|
||||
--file "$WORKSPACE_DIR/Dockerfile" \
|
||||
--target test-runner \
|
||||
--build-arg GIT_COMMIT=${{ github.sha }} \
|
||||
-t ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
|
||||
.
|
||||
"$WORKSPACE_DIR"
|
||||
|
||||
- name: Run tests inside test-capable container
|
||||
if: steps.commit.outputs.committed == 'true'
|
||||
@@ -127,12 +130,15 @@ jobs:
|
||||
- name: Build production image
|
||||
if: steps.commit.outputs.committed == 'true'
|
||||
run: |
|
||||
WORKSPACE_DIR="$GITHUB_WORKSPACE"
|
||||
docker build \
|
||||
--context "$WORKSPACE_DIR" \
|
||||
--file "$WORKSPACE_DIR/Dockerfile" \
|
||||
--target runner \
|
||||
--build-arg GIT_COMMIT=${{ github.sha }} \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }} \
|
||||
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
|
||||
.
|
||||
"$WORKSPACE_DIR"
|
||||
|
||||
- name: Push Docker images
|
||||
if: steps.commit.outputs.committed == 'true'
|
||||
@@ -163,32 +169,26 @@ jobs:
|
||||
if: steps.commit.outputs.committed == 'true'
|
||||
run: |
|
||||
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
|
||||
|
||||
# Update docker-compose.yml with new image tag using full registry path
|
||||
# The registry is docker.notsosm.art and image is euchre-camp
|
||||
|
||||
# Update dev compose file with new image tag
|
||||
IMAGE_TAG="${{ steps.version.outputs.new_version }}"
|
||||
sed -i "s|image: docker.notsosm.art/euchre-camp:[0-9.]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" docker-compose.yml
|
||||
|
||||
# Copy the updated docker-compose.yml to the deployment location
|
||||
# The runners are on the same Docker server where the container is running
|
||||
sudo mkdir -p /home/euchre_camp
|
||||
sudo cp docker-compose.yml /home/euchre_camp/
|
||||
sudo chown -R euchre:euchre /home/euchre_camp
|
||||
|
||||
COMPOSE_FILE="/apps/intelligent_silasak/docker-compose.yml"
|
||||
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" ${COMPOSE_FILE}
|
||||
|
||||
# Pull and restart the dev container
|
||||
cd /home/euchre_camp
|
||||
docker-compose pull app
|
||||
docker-compose up -d app
|
||||
|
||||
cd /apps/intelligent_silasak
|
||||
docker compose pull app
|
||||
docker compose up -d app
|
||||
|
||||
# Wait for container to be healthy
|
||||
echo "Waiting for container to start..."
|
||||
sleep 10
|
||||
|
||||
# Check if container is running
|
||||
if docker ps --filter "name=euchre-camp-app" --format "{{.Status}}" | grep -q "Up"; then
|
||||
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
|
||||
else
|
||||
echo "❌ Dev environment deployment failed"
|
||||
docker-compose logs app
|
||||
exit 1
|
||||
fi
|
||||
echo "Waiting for dev site to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if curl -sf https://euchre-dev.notsosm.art/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
|
||||
exit 0
|
||||
fi
|
||||
sleep 0.5
|
||||
done
|
||||
echo "❌ Dev environment deployment failed"
|
||||
docker compose logs app
|
||||
exit 1
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
/playwright/.auth/
|
||||
/test-results
|
||||
/cookies.txt
|
||||
.env.test
|
||||
prisma/ci.db
|
||||
|
||||
# next.js
|
||||
/.next/
|
||||
|
||||
+24
-8
@@ -24,11 +24,11 @@
|
||||
- [x] Write TODO list to repository file
|
||||
- [x] Auto-create tournament when uploading matches without selecting one
|
||||
|
||||
### In Progress 🔄
|
||||
- [ ] Update API routes to handle new variant scoring fields
|
||||
- [ ] Update EditTournamentForm to add variant scoring controls
|
||||
- [ ] Update MatchEditor to use tournament-specific target score
|
||||
- [ ] Run tests and verify variant scoring implementation
|
||||
### Completed ✅
|
||||
- [x] Update API routes to handle new variant scoring fields
|
||||
- [x] Update EditTournamentForm to add variant scoring controls
|
||||
- [x] Update MatchEditor to use tournament-specific target score
|
||||
- [x] Run tests and verify variant scoring implementation
|
||||
|
||||
### Recently Completed ✅
|
||||
- [x] Update CI/CD workflows to use Bun (PR, release)
|
||||
@@ -59,11 +59,27 @@
|
||||
- [x] Create migration to add rating system tables (elo_ratings, glicko2_ratings, open_skill_ratings)
|
||||
- [x] Add tabbed rankings page to display Elo, OpenSkill, and Glicko2 ratings
|
||||
|
||||
### Completed ✅
|
||||
- [x] Add UI controls for variant scoring in tournament creation/edit
|
||||
- [x] Test variant tournament functionality end-to-end (e2e/tournament-edit-allowTies.test.ts)
|
||||
- [x] Add validation for tie scores based on tournament configuration (MatchEditor.tsx)
|
||||
|
||||
### Completed ✅ (CI/DB Infrastructure)
|
||||
- [x] Fix PostgreSQL database ownership — each env owns its own DB
|
||||
- [x] Fix role attributes — euchre_camp_dev gets CREATEDB, euchre_camp_ci loses SUPERUSER
|
||||
- [x] Update .env.development to use euchre_camp_dev user
|
||||
- [x] Update .env.development.local to use euchre_camp_dev user
|
||||
- [x] Update CI docker-compose to use euchre_camp_ci user
|
||||
- [x] Update dev docker-compose to use euchre_camp_dev user
|
||||
- [x] Recreate dev and CI containers with correct credentials
|
||||
- [x] Fix Playwright baseURL for CI (https://euchre-ci.notsosm.art)
|
||||
- [x] Fix Navigation unit tests (RoleSwitcherProvider wrapper)
|
||||
- [x] Fix secrets vs vars in PR workflow (secrets.CI_DATABASE_URL)
|
||||
|
||||
### Backlog 📋
|
||||
- [ ] Add UI controls for variant scoring in tournament creation/edit
|
||||
- [ ] Test variant tournament functionality end-to-end
|
||||
- [ ] Add validation for tie scores based on tournament configuration
|
||||
- [ ] Document variant tournament features
|
||||
- [ ] Update Gitea secret CI_DATABASE_URL to use euchre_camp_ci user
|
||||
- [ ] Test isolation improvements for parallel CI execution
|
||||
|
||||
## Recently Completed (Detailed)
|
||||
|
||||
|
||||
+10
-4
@@ -5,6 +5,7 @@
|
||||
|
||||
import { chromium, type FullConfig } from '@playwright/test';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { PrismaPg } from '@prisma/adapter-pg';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
|
||||
@@ -40,6 +41,13 @@ if (isProductionDatabase()) {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
function createPrismaClient() {
|
||||
const databaseUrl = process.env.DATABASE_URL;
|
||||
if (!databaseUrl) throw new Error('DATABASE_URL is required');
|
||||
const adapter = new PrismaPg({ connectionString: databaseUrl });
|
||||
return new PrismaClient({ adapter });
|
||||
}
|
||||
|
||||
async function resetDatabaseSchema(prisma: PrismaClient) {
|
||||
console.log('Resetting database schema...');
|
||||
|
||||
@@ -52,8 +60,6 @@ async function resetDatabaseSchema(prisma: PrismaClient) {
|
||||
await prisma.$executeRawUnsafe(`
|
||||
DROP SCHEMA public CASCADE;
|
||||
CREATE SCHEMA public;
|
||||
GRANT ALL ON SCHEMA public TO postgres;
|
||||
GRANT ALL ON SCHEMA public TO public;
|
||||
`);
|
||||
console.log(`Dropped ${tables.length} tables`);
|
||||
}
|
||||
@@ -133,7 +139,7 @@ async function createTestUsers(config: FullConfig) {
|
||||
|
||||
await page.waitForTimeout(2000);
|
||||
|
||||
const prisma = new PrismaClient();
|
||||
const prisma = createPrismaClient();
|
||||
const user = await prisma.user.findUnique({ where: { email: adminEmail } });
|
||||
|
||||
if (user) {
|
||||
@@ -169,7 +175,7 @@ export default async function globalSetup(config: FullConfig) {
|
||||
|
||||
if (isCIDatabase()) {
|
||||
console.log('CI environment detected - will reset database schema');
|
||||
const prisma = new PrismaClient();
|
||||
const prisma = createPrismaClient();
|
||||
await resetDatabaseSchema(prisma);
|
||||
await prisma.$disconnect();
|
||||
} else if (!isProductionDatabase()) {
|
||||
|
||||
+11
-5
@@ -8,6 +8,7 @@
|
||||
|
||||
import { type FullConfig } from '@playwright/test';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { PrismaPg } from '@prisma/adapter-pg';
|
||||
import { execSync } from 'child_process';
|
||||
|
||||
const TEST_PATTERNS = {
|
||||
@@ -61,6 +62,13 @@ function buildEmailLikeClause(patterns: string[]): string {
|
||||
return patterns.map(p => `email LIKE '${p}'`).join(' OR ');
|
||||
}
|
||||
|
||||
function createPrismaClient() {
|
||||
const databaseUrl = process.env.DATABASE_URL;
|
||||
if (!databaseUrl) throw new Error('DATABASE_URL is required');
|
||||
const adapter = new PrismaPg({ connectionString: databaseUrl });
|
||||
return new PrismaClient({ adapter });
|
||||
}
|
||||
|
||||
async function resetDatabaseSchema(prisma: PrismaClient) {
|
||||
console.log('Resetting database schema...');
|
||||
|
||||
@@ -73,8 +81,6 @@ async function resetDatabaseSchema(prisma: PrismaClient) {
|
||||
await prisma.$executeRawUnsafe(`
|
||||
DROP SCHEMA public CASCADE;
|
||||
CREATE SCHEMA public;
|
||||
GRANT ALL ON SCHEMA public TO postgres;
|
||||
GRANT ALL ON SCHEMA public TO public;
|
||||
`);
|
||||
console.log(`Dropped ${tables.length} tables`);
|
||||
}
|
||||
@@ -109,16 +115,16 @@ export default async function globalTeardown(config: FullConfig) {
|
||||
|
||||
if (isCIDatabase()) {
|
||||
console.log('CI environment - resetting database schema');
|
||||
const prisma = new PrismaClient();
|
||||
const prisma = createPrismaClient();
|
||||
await resetDatabaseSchema(prisma);
|
||||
await prisma.$disconnect();
|
||||
} else if (isProductionDatabase()) {
|
||||
console.log('Production environment - selective cleanup of test records');
|
||||
const prisma = new PrismaClient();
|
||||
const prisma = createPrismaClient();
|
||||
await cleanupTestRecords(prisma);
|
||||
} else {
|
||||
console.log('Development environment - selective cleanup of test records');
|
||||
const prisma = new PrismaClient();
|
||||
const prisma = createPrismaClient();
|
||||
await cleanupTestRecords(prisma);
|
||||
}
|
||||
|
||||
|
||||
@@ -239,3 +239,72 @@ workflow-status:
|
||||
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
||||
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
||||
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
|
||||
|
||||
# --- Production Deployment ---
|
||||
|
||||
# Deploy a specific version to production (human gate)
|
||||
# Usage: just deploy-prod v0.1.21
|
||||
deploy-prod version:
|
||||
@echo "Deploying {{version}} to production..."
|
||||
@echo "This requires the image to already be pushed to the registry."
|
||||
@echo ""
|
||||
@read -p "Have you verified this version works in dev? (y/N) " confirm; \
|
||||
if [ "$$confirm" != "y" ]; then \
|
||||
echo "Cancelled. Please verify in dev first."; \
|
||||
exit 1; \
|
||||
fi
|
||||
cd /apps/youthful_simon && \
|
||||
sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:{{version}}|" docker-compose.yml && \
|
||||
sed -i "s|image: euchre-camp/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:{{version}}|" docker-compose.yml && \
|
||||
docker compose pull app && \
|
||||
docker compose up -d app && \
|
||||
echo "Waiting for production site to be healthy..." && \
|
||||
for i in {1..30}; do \
|
||||
if curl -sf https://euchre.notsosm.art/api/health > /dev/null 2>&1; then \
|
||||
echo "✅ Production successfully deployed with version {{version}}"; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
sleep 0.5; \
|
||||
done && \
|
||||
echo "❌ Production deployment failed - health check timed out"; \
|
||||
docker compose logs app; \
|
||||
exit 1
|
||||
|
||||
# Show current deployment status across all environments
|
||||
status:
|
||||
@echo "=== EuchreCamp Deployment Status ==="
|
||||
@echo ""
|
||||
@echo "CI Site (euchre-camp-ci):"
|
||||
@grep "image:" /apps/euchre_camp_ci/docker-compose.yml | head -1
|
||||
@echo ""
|
||||
@echo "Dev Site (euchre-camp-dev):"
|
||||
@grep "image:" /apps/intelligent_silasak/docker-compose.yml | head -1
|
||||
@echo ""
|
||||
@echo "Prod Site (euchre-camp):"
|
||||
@grep "image:" /apps/youthful_simon/docker-compose.yml | head -1
|
||||
@echo ""
|
||||
|
||||
# --- SDLC Database Operations ---
|
||||
|
||||
# Sync production data to development database (manual operation)
|
||||
sync-dev:
|
||||
@echo "Syncing production data to development database..."
|
||||
node scripts/sync-prod-to-dev.js
|
||||
|
||||
# Run acceptance tests against production database (opt-in, manual)
|
||||
test-prod:
|
||||
@echo "⚠️ WARNING: This will run tests against the PRODUCTION database!"
|
||||
@echo " All test records will be cleaned up after the run."
|
||||
@echo ""
|
||||
@read -p "Are you sure you want to continue? (y/N) " confirm; \
|
||||
if [ "$$confirm" != "y" ]; then \
|
||||
echo "Cancelled."; \
|
||||
else \
|
||||
DATABASE_URL="$$PROD_DATABASE_URL" bun test:acceptance; \
|
||||
fi
|
||||
|
||||
# Reset CI database (for local CI testing)
|
||||
reset-ci-db:
|
||||
@echo "Resetting CI database..."
|
||||
psql "$CI_DATABASE_URL" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
|
||||
bunx prisma migrate deploy
|
||||
|
||||
@@ -11,16 +11,17 @@ export default defineConfig({
|
||||
// Fail the build on CI if you accidentally left test.only in the source code.
|
||||
forbidOnly: !!process.env.CI,
|
||||
// Retry on CI only.
|
||||
retries: process.env.CI ? 2 : 0,
|
||||
// Always run with 1 worker to avoid database conflicts
|
||||
workers: 1,
|
||||
retries: process.env.CI ? 1 : 0,
|
||||
// Use 2 workers in CI for parallel project execution; 1 locally
|
||||
workers: process.env.CI ? 2 : 1,
|
||||
// Reporter to use
|
||||
reporter: 'html',
|
||||
// Global setup and teardown
|
||||
globalSetup: require.resolve('./e2e/global.setup'),
|
||||
globalTeardown: require.resolve('./e2e/global.teardown'),
|
||||
// Use base URL for relative navigation
|
||||
use: {
|
||||
baseURL: 'http://localhost:3000',
|
||||
baseURL: process.env.CI ? 'https://euchre-ci.notsosm.art' : 'http://localhost:3000',
|
||||
// Collect trace when retrying the failed test.
|
||||
trace: 'on-first-retry',
|
||||
// Capture screenshot only on failure
|
||||
@@ -65,8 +66,8 @@ export default defineConfig({
|
||||
},
|
||||
],
|
||||
// Run your local dev server before starting the tests
|
||||
webServer: {
|
||||
command: 'npm run dev',
|
||||
webServer: process.env.CI ? undefined : {
|
||||
command: 'bun run dev',
|
||||
url: 'http://localhost:3000',
|
||||
timeout: 120000,
|
||||
reuseExistingServer: !process.env.CI,
|
||||
|
||||
@@ -0,0 +1,157 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**
|
||||
* Sync production data to development database
|
||||
*
|
||||
* This script copies real data from production to development, filtering out
|
||||
* test records to keep the dev database clean for testing.
|
||||
*/
|
||||
|
||||
const { execSync } = require('child_process');
|
||||
const fs = require('fs');
|
||||
const os = require('os');
|
||||
const path = require('path');
|
||||
|
||||
const PROD_DB_URL = process.env.PROD_DATABASE_URL;
|
||||
const DEV_DB_URL = process.env.DEV_DATABASE_URL;
|
||||
|
||||
if (!PROD_DB_URL || !DEV_DB_URL) {
|
||||
console.error('❌ Missing environment variables');
|
||||
console.error('Please set PROD_DATABASE_URL and DEV_DATABASE_URL');
|
||||
console.error('');
|
||||
console.error('Example:');
|
||||
console.error(' PROD_DATABASE_URL="postgresql://user:pass@host:5432/euchre_camp" \\');
|
||||
console.error(' DEV_DATABASE_URL="postgresql://user:pass@host:5432/euchre_camp_dev" \\');
|
||||
console.error(' node scripts/sync-prod-to-dev.js');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (PROD_DB_URL.includes('_dev') || PROD_DB_URL.includes('_ci')) {
|
||||
console.error('❌ PROD_DATABASE_URL appears to be a non-production database!');
|
||||
console.error(' This script should only be used with the production database.');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const TEST_PATTERNS = {
|
||||
players: [
|
||||
'%Test%',
|
||||
'%Setup%',
|
||||
'%Home Test%',
|
||||
'%Home Match Player%',
|
||||
'%Admin User%',
|
||||
'%NinePart%',
|
||||
'%Nine Part%',
|
||||
'%Test Player%',
|
||||
'%TestUser%',
|
||||
'%Cucumber%',
|
||||
'%Config Admin%',
|
||||
],
|
||||
events: [
|
||||
'%Test%',
|
||||
'%Setup%',
|
||||
'%Recent%',
|
||||
'%Test Tournament%',
|
||||
'%Cucumber%',
|
||||
],
|
||||
users: [
|
||||
'%test%',
|
||||
'%setup%',
|
||||
'%cucumber%',
|
||||
'%TestUser%',
|
||||
]
|
||||
};
|
||||
|
||||
function buildLikeClause(patterns) {
|
||||
return patterns.map(p => `name LIKE '${p}'`).join(' OR ');
|
||||
}
|
||||
|
||||
function buildEmailLikeClause(patterns) {
|
||||
return patterns.map(p => `email LIKE '${p}'`).join(' OR ');
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('🔄 Syncing production data to development database');
|
||||
console.log('====================================================\n');
|
||||
|
||||
const readline = require('readline');
|
||||
const rl = readline.createInterface({
|
||||
input: process.stdin,
|
||||
output: process.stdout
|
||||
});
|
||||
|
||||
console.log('⚠️ WARNING: This will OVERWRITE the development database!');
|
||||
console.log(' Production data will be copied, with test records excluded.');
|
||||
console.log('');
|
||||
console.log('Source:', PROD_DB_URL.replace(/:[^:@]+@/, ':***@'));
|
||||
console.log('Target:', DEV_DB_URL.replace(/:[^:@]+@/, ':***@'));
|
||||
console.log('');
|
||||
|
||||
rl.question('Type "sync" to confirm: ', async (answer) => {
|
||||
if (answer !== 'sync') {
|
||||
console.log('❌ Cancelled');
|
||||
rl.close();
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
rl.close();
|
||||
|
||||
try {
|
||||
console.log('\n📦 Dumping production data...');
|
||||
|
||||
const dumpFile = path.join(os.tmpdir(), `prod_dump_${Date.now()}.sql`);
|
||||
|
||||
execSync(`pg_dump "${PROD_DB_URL}" -f "${dumpFile}" --no-owner --no-acl`, {
|
||||
stdio: 'inherit'
|
||||
});
|
||||
console.log('✅ Dump created');
|
||||
|
||||
console.log('\n🗑️ Clearing development database...');
|
||||
execSync(`psql "${DEV_DB_URL}" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"`, {
|
||||
stdio: 'inherit'
|
||||
});
|
||||
console.log('✅ Development database cleared');
|
||||
|
||||
console.log('\n📥 Restoring to development database...');
|
||||
execSync(`psql "${DEV_DB_URL}" -f "${dumpFile}"`, {
|
||||
stdio: 'inherit'
|
||||
});
|
||||
console.log('✅ Data restored');
|
||||
|
||||
console.log('\n🧹 Cleaning up test records in dev database...');
|
||||
|
||||
const playerWhere = buildLikeClause(TEST_PATTERNS.players);
|
||||
const eventWhere = buildLikeClause(TEST_PATTERNS.events);
|
||||
const userWhere = buildEmailLikeClause(TEST_PATTERNS.users);
|
||||
|
||||
execSync(`psql "${DEV_DB_URL}" -c "DELETE FROM events WHERE (${eventWhere});"`, {
|
||||
stdio: 'inherit'
|
||||
});
|
||||
console.log(' Deleted test events');
|
||||
|
||||
execSync(`psql "${DEV_DB_URL}" -c "DELETE FROM players WHERE (${playerWhere});"`, {
|
||||
stdio: 'inherit'
|
||||
});
|
||||
console.log(' Deleted test players');
|
||||
|
||||
execSync(`psql "${DEV_DB_URL}" -c "DELETE FROM users WHERE (${userWhere}) AND \"playerId\" IS NULL;"`, {
|
||||
stdio: 'inherit'
|
||||
});
|
||||
console.log(' Deleted test users');
|
||||
|
||||
fs.unlinkSync(dumpFile);
|
||||
console.log('\n🧹 Cleaned up temporary dump file');
|
||||
|
||||
console.log('\n✅ Sync complete!');
|
||||
console.log('\n📊 Summary:');
|
||||
console.log(' - Production data copied to development');
|
||||
console.log(' - Test records filtered out');
|
||||
console.log(' - Development database is now a mirror of production (minus test data)');
|
||||
|
||||
} catch (error) {
|
||||
console.error('\n❌ Sync failed:', error.message);
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
main();
|
||||
@@ -8,6 +8,7 @@
|
||||
import { describe, it, expect, mock, beforeEach, afterEach } from 'bun:test'
|
||||
import { render, screen, waitFor } from '@testing-library/react'
|
||||
import Navigation from '@/components/Navigation'
|
||||
import { RoleSwitcherProvider } from '@/components/RoleSwitcher'
|
||||
|
||||
// Mock next/link
|
||||
mock.module('next/link', () => ({
|
||||
@@ -31,6 +32,14 @@ mock.module('@/lib/auth-client', () => ({
|
||||
// Mock fetch for role API call
|
||||
global.fetch = mock(async () => new Response()) as any
|
||||
|
||||
function renderNavigation() {
|
||||
return render(
|
||||
<RoleSwitcherProvider>
|
||||
<Navigation />
|
||||
</RoleSwitcherProvider>
|
||||
)
|
||||
}
|
||||
|
||||
import { useSession as useSessionOriginal } from '@/components/SessionProvider'
|
||||
const useSession = useSessionOriginal as any
|
||||
|
||||
@@ -61,7 +70,7 @@ describe('Epic 1: Navigation Component', () => {
|
||||
refreshSession: mock(() => {}),
|
||||
})
|
||||
|
||||
render(<Navigation />)
|
||||
renderNavigation()
|
||||
|
||||
expect(screen.getByText('EuchreCamp')).toBeInTheDocument()
|
||||
expect(screen.getByText('Rankings')).toBeInTheDocument()
|
||||
@@ -84,7 +93,7 @@ describe('Epic 1: Navigation Component', () => {
|
||||
refreshSession: mock(() => {}),
|
||||
})
|
||||
|
||||
render(<Navigation />)
|
||||
renderNavigation()
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText('Test User')).toBeInTheDocument()
|
||||
@@ -109,7 +118,7 @@ describe('Epic 1: Navigation Component', () => {
|
||||
refreshSession: mock(() => {}),
|
||||
})
|
||||
|
||||
render(<Navigation />)
|
||||
renderNavigation()
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText('Tournaments')).toBeInTheDocument()
|
||||
@@ -142,7 +151,7 @@ describe('Epic 1: Navigation Component', () => {
|
||||
return new Response(JSON.stringify({}), { status: 200 })
|
||||
})
|
||||
|
||||
render(<Navigation />)
|
||||
renderNavigation()
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText('Admin')).toBeInTheDocument()
|
||||
@@ -177,7 +186,7 @@ describe('Epic 1: Navigation Component', () => {
|
||||
} as Response
|
||||
})
|
||||
|
||||
render(<Navigation />)
|
||||
renderNavigation()
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText('Tournaments')).toBeInTheDocument()
|
||||
@@ -192,7 +201,7 @@ describe('Epic 1: Navigation Component', () => {
|
||||
refreshSession: mock(() => {}),
|
||||
})
|
||||
|
||||
render(<Navigation />)
|
||||
renderNavigation()
|
||||
|
||||
expect(screen.getByText('Loading...')).toBeInTheDocument()
|
||||
})
|
||||
|
||||
@@ -47,7 +47,9 @@ describe('getSession', () => {
|
||||
})
|
||||
|
||||
it('returns null when an error occurs', async () => {
|
||||
mockFetch.mockRejectedValue(new Error('Network error'))
|
||||
mockFetch.mockImplementation(async () => {
|
||||
throw new Error('Network error')
|
||||
})
|
||||
|
||||
const result = await getSession()
|
||||
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
/**
|
||||
* Unit Tests: Permissions
|
||||
*
|
||||
*
|
||||
* Tests the permission system for tournament management
|
||||
*/
|
||||
|
||||
import { describe, test, expect, mock, beforeEach } from 'bun:test';
|
||||
import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions';
|
||||
import { getSession } from '@/lib/auth-simple';
|
||||
import { prisma } from '@/lib/prisma';
|
||||
import type { User } from '@prisma/client';
|
||||
|
||||
// Create mock functions at module level
|
||||
@@ -58,7 +57,7 @@ describe('Permissions', () => {
|
||||
user: { id: '1', email: 'test@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('1', 'test@example.com', 'club_admin')
|
||||
);
|
||||
|
||||
@@ -71,7 +70,7 @@ describe('Permissions', () => {
|
||||
user: { id: '1', email: 'test@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('1', 'test@example.com', 'player')
|
||||
);
|
||||
|
||||
@@ -94,7 +93,7 @@ describe('Permissions', () => {
|
||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||
);
|
||||
|
||||
@@ -107,7 +106,7 @@ describe('Permissions', () => {
|
||||
user: { id: 'player-1', email: 'player@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('player-1', 'player@example.com', 'player')
|
||||
);
|
||||
|
||||
@@ -123,7 +122,7 @@ describe('Permissions', () => {
|
||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
|
||||
);
|
||||
|
||||
@@ -136,7 +135,7 @@ describe('Permissions', () => {
|
||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||
);
|
||||
|
||||
@@ -149,7 +148,7 @@ describe('Permissions', () => {
|
||||
user: { id: 'player-1', email: 'player@example.com' },
|
||||
session: { token: 'test', expiresAt: new Date() }
|
||||
}));
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
userFindUniqueMock.mockImplementation(async () =>
|
||||
createMockUser('player-1', 'player@example.com', 'player')
|
||||
);
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Tests the allowTies field is properly saved when updating tournaments
|
||||
*/
|
||||
|
||||
import { describe, it, expect, mock, beforeEach,} from 'bun:test';
|
||||
import { describe, it, expect, mock, beforeEach, afterAll } from 'bun:test';
|
||||
|
||||
// Create mock functions at module level
|
||||
const eventFindUniqueMock = mock(async () => ({}));
|
||||
@@ -27,6 +27,11 @@ mock.module('@/lib/permissions', () => ({
|
||||
canDeleteTournament: canDeleteTournamentMock,
|
||||
}));
|
||||
|
||||
// Cleanup after all tests in this file
|
||||
afterAll(() => {
|
||||
mock.restore('module');
|
||||
});
|
||||
|
||||
// Import the route handler after mocking
|
||||
import { PUT } from '@/app/api/tournaments/[id]/route';
|
||||
import { prisma } from '@/lib/prisma';
|
||||
|
||||
Reference in New Issue
Block a user