Compare commits
10 Commits
941d857feb
...
7ee336c51c
| Author | SHA1 | Date | |
|---|---|---|---|
| 7ee336c51c | |||
| d24e810ad1 | |||
| 397594a9df | |||
| 4116884f9f | |||
| b445d9044a | |||
| 81c93bafc1 | |||
| ba180ae6e1 | |||
| c611c68822 | |||
| 4c2687498f | |||
| 3983049d2c |
@@ -1,82 +0,0 @@
|
||||
# CI Image Builder Workflow
|
||||
# Automatically builds and pushes CI images when dependencies change
|
||||
# Uses GitHub Container Registry (GHCR) or any container registry
|
||||
|
||||
name: CI Image Builder
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- 'package.json'
|
||||
- 'package-lock.json'
|
||||
- 'Dockerfile.ci'
|
||||
- '.gitea/workflows/ci-image-builder.yml'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
force_rebuild:
|
||||
description: 'Force rebuild even if no changes detected'
|
||||
required: false
|
||||
default: 'false'
|
||||
type: boolean
|
||||
|
||||
env:
|
||||
# Use GHCR or your own registry
|
||||
REGISTRY: ghcr.io
|
||||
IMAGE_NAME: ${{ github.repository }}/ci-runner
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
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: Log in to Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Extract metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
tags: |
|
||||
type=sha,prefix={{branch}}-
|
||||
type=ref,event=branch
|
||||
type=ref,event=pr
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
|
||||
- name: Build and push CI image
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
file: Dockerfile.ci
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
|
||||
- name: Update workflow documentation
|
||||
run: |
|
||||
echo "CI Image built and pushed successfully!"
|
||||
echo ""
|
||||
echo "Available tags:"
|
||||
echo " - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
|
||||
echo " - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
|
||||
echo ""
|
||||
echo "To use in workflows:"
|
||||
echo " container:"
|
||||
echo " image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
|
||||
@@ -13,10 +13,6 @@ jobs:
|
||||
options: --user root
|
||||
|
||||
steps:
|
||||
- name: Install system dependencies
|
||||
run: |
|
||||
apk add --no-cache bash git
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
@@ -30,7 +26,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
needs: unit-tests
|
||||
container:
|
||||
image: node:20-alpine
|
||||
image: mcr.microsoft.com/playwright:v1.58.0-jammy
|
||||
options: --user root
|
||||
env:
|
||||
DATABASE_PROVIDER: sqlite
|
||||
@@ -38,18 +34,21 @@ jobs:
|
||||
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
|
||||
|
||||
steps:
|
||||
- name: Install system dependencies
|
||||
run: |
|
||||
apk add --no-cache bash git
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Generate Prisma client
|
||||
run: npx prisma generate
|
||||
env:
|
||||
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||
|
||||
- name: Setup SQLite database
|
||||
run: |
|
||||
|
||||
@@ -80,8 +80,12 @@ jobs:
|
||||
- name: Commit version bump
|
||||
run: |
|
||||
git add package.json CHANGELOG.md
|
||||
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
|
||||
git push origin main
|
||||
if git diff --cached --quiet; then
|
||||
echo "No changes to commit (version may already be at target version)"
|
||||
else
|
||||
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
|
||||
git push origin main
|
||||
fi
|
||||
|
||||
- name: Create git tag for release
|
||||
run: |
|
||||
|
||||
@@ -15,10 +15,6 @@ jobs:
|
||||
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
|
||||
|
||||
steps:
|
||||
- name: Install system dependencies
|
||||
run: |
|
||||
apk add --no-cache bash git
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
|
||||
@@ -129,23 +129,26 @@ DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptanc
|
||||
|
||||
### CI Runner Image
|
||||
|
||||
To speed up CI runs, the project uses a pre-built CI runner image with all dependencies pre-installed.
|
||||
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
|
||||
|
||||
**Building the CI image locally:**
|
||||
```bash
|
||||
./scripts/build-ci-image.sh [tag]
|
||||
```
|
||||
The original attempt to use a pre-built CI runner image with pre-installed dependencies encountered fundamental issues with how Gitea Actions handles workspace mounting. When Gitea Actions runs a container job, it mounts the workspace at a specific path (e.g., `/workspace/david/euchre_camp`), which hides the container's `/app` directory where dependencies were installed.
|
||||
|
||||
**Using the CI image:**
|
||||
- Workflows automatically use `ghcr.io/<repo>/ci-runner:latest` when available
|
||||
- Falls back to `node:20-alpine` if image is not found
|
||||
- Image is automatically rebuilt when `package.json` changes
|
||||
**Current Approach:**
|
||||
- Workflows use standard `node:20-alpine` or `mcr.microsoft.com/playwright` containers
|
||||
- Dependencies are installed via `npm ci` in each workflow run
|
||||
- This is the recommended approach for Gitea Actions
|
||||
|
||||
**CI Image contains:**
|
||||
- Node.js 20 Alpine
|
||||
- All npm dependencies pre-installed
|
||||
- Prisma client pre-generated
|
||||
- System tools (bash, git, python, make, g++)
|
||||
**Why the CI image approach doesn't work:**
|
||||
1. Dockerfile.ci installs dependencies in `/app`
|
||||
2. Gitea Actions mounts workspace at `/workspace/david/euchre_camp`
|
||||
3. Workspace mount hides the `/app` directory
|
||||
4. Symlinks from `/app/node_modules` don't work because `/app` is hidden
|
||||
|
||||
**Alternative for performance:**
|
||||
If CI performance becomes an issue, consider:
|
||||
- Using GitHub Actions cache for node_modules
|
||||
- Using a self-hosted runner with persistent workspace
|
||||
- Using the main Dockerfile's `test-runner` target for release workflows (which works because it builds a complete image)
|
||||
|
||||
### CI/CD Pipeline
|
||||
The project uses Gitea Actions for continuous integration:
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
# CI Runner Image for EuchreCamp
|
||||
# Pre-installed with all dependencies to speed up CI runs
|
||||
# This image is rebuilt automatically when package.json changes
|
||||
|
||||
FROM node:20-alpine
|
||||
|
||||
# Install system dependencies needed for various tasks
|
||||
RUN apk add --no-cache \
|
||||
bash \
|
||||
git \
|
||||
curl \
|
||||
python3 \
|
||||
make \
|
||||
g++ \
|
||||
&& rm -rf /var/cache/apk/*
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /app
|
||||
|
||||
# Copy package files first (for better caching)
|
||||
COPY package*.json ./
|
||||
|
||||
# Install ALL dependencies including dev dependencies
|
||||
# This is done at image build time, not at CI runtime
|
||||
RUN npm ci
|
||||
|
||||
# Copy Prisma schema (needed for Prisma client generation)
|
||||
COPY prisma/schema.prisma ./prisma/
|
||||
|
||||
# Generate Prisma client
|
||||
RUN npx prisma generate
|
||||
|
||||
# Copy the rest of the application
|
||||
COPY . .
|
||||
|
||||
# Set environment variables for CI environment
|
||||
ENV NODE_ENV=production
|
||||
ENV DATABASE_PROVIDER=sqlite
|
||||
ENV DATABASE_URL=file:./prisma/ci.db
|
||||
ENV BETTER_AUTH_SECRET=test-secret-key-for-ci-only
|
||||
|
||||
# Verify installations
|
||||
RUN node --version && npm --version && git --version && npx prisma --version
|
||||
|
||||
# Default command
|
||||
CMD ["/bin/sh"]
|
||||
@@ -368,35 +368,27 @@ The application uses Gitea Actions for continuous integration and deployment:
|
||||
- Unit tests for quick feedback
|
||||
- Skips auto-generated version bumps
|
||||
|
||||
3. **Release Workflow** (`.gitea/workflows/release.yml`): Runs on main branch pushes
|
||||
- Version bumping and tagging
|
||||
- Docker image building and testing
|
||||
- Registry push and deployment
|
||||
|
||||
4. **CI Image Builder** (`.gitea/workflows/ci-image-builder.yml`): Runs when dependencies change
|
||||
- Automatically builds CI runner image with all dependencies pre-installed
|
||||
- Triggered by changes to `package.json`, `package-lock.json`, or `Dockerfile.ci`
|
||||
3. **Release Workflow** (`.gitea/workflows/release.yml`): Runs on main branch pushes
|
||||
- Version bumping and tagging
|
||||
- Docker image building and testing
|
||||
- Registry push and deployment
|
||||
|
||||
### CI Runner Image
|
||||
|
||||
To avoid installing dependencies on every workflow run, we use a pre-built CI runner image:
|
||||
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
|
||||
|
||||
**Dockerfile.ci** - Contains:
|
||||
- Node.js 20 Alpine
|
||||
- All npm dependencies pre-installed
|
||||
- Prisma client pre-generated
|
||||
- System tools (bash, git, python, make, g++)
|
||||
The original attempt to use a pre-built CI runner image with pre-installed dependencies encountered fundamental issues with how Gitea Actions handles workspace mounting. When Gitea Actions runs a container job, it mounts the workspace at a specific path (e.g., `/workspace/david/euchre_camp`), which hides the container's `/app` directory where dependencies were installed.
|
||||
|
||||
**Automatic Rebuilding:**
|
||||
- The CI image is automatically rebuilt when `package.json` or `package-lock.json` changes
|
||||
- Images are tagged with commit SHA for traceability
|
||||
- Falls back to `node:20-alpine` if custom image is not available
|
||||
**Current Approach:**
|
||||
- Workflows use standard `node:20-alpine` or `mcr.microsoft.com/playwright` containers
|
||||
- Dependencies are installed via `npm ci` in each workflow run
|
||||
- This is the recommended approach for Gitea Actions
|
||||
|
||||
**Manual Build:**
|
||||
```bash
|
||||
docker build -f Dockerfile.ci -t euchre-camp-ci:latest .
|
||||
docker run --rm euchre-camp-ci:latest node --version
|
||||
```
|
||||
**Why the CI image approach doesn't work:**
|
||||
1. Dockerfile.ci installs dependencies in `/app`
|
||||
2. Gitea Actions mounts workspace at `/workspace/david/euchre_camp`
|
||||
3. Workspace mount hides the `/app` directory
|
||||
4. Symlinks from `/app/node_modules` don't work because `/app` is hidden
|
||||
|
||||
### Database Strategy for CI
|
||||
- **CI Tests**: SQLite database (fast, no server required)
|
||||
@@ -410,9 +402,6 @@ npm run test:run
|
||||
|
||||
# Run acceptance tests with SQLite
|
||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
|
||||
|
||||
# Run tests in CI container (if built)
|
||||
docker run --rm -v $(pwd):/app -w /app euchre-camp-ci:latest npm run test:run
|
||||
```
|
||||
|
||||
## Docker Deployment
|
||||
|
||||
@@ -173,16 +173,6 @@ pr-validate: lint typecheck test-unit test-acceptance-sqlite
|
||||
ci-postgres: lint typecheck test-unit test-acceptance-postgres docker-build
|
||||
@echo "CI Pipeline with PostgreSQL completed successfully!"
|
||||
|
||||
# --- CI Image ---
|
||||
|
||||
# Build CI runner image locally
|
||||
ci-build:
|
||||
@./scripts/build-ci-image.sh
|
||||
|
||||
# Build CI runner image with custom tag
|
||||
ci-build-tag TAG:
|
||||
@./scripts/build-ci-image.sh {{TAG}}
|
||||
|
||||
# --- Utilities ---
|
||||
|
||||
# Show help information
|
||||
@@ -256,6 +246,8 @@ 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)"
|
||||
@echo ""
|
||||
@echo "Note: CI image approach deprecated due to Gitea Actions workspace mounting"
|
||||
|
||||
# Check current database provider
|
||||
db-status:
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Build and test the CI runner image locally
|
||||
|
||||
set -e
|
||||
|
||||
IMAGE_NAME="euchre-camp-ci"
|
||||
TAG="${1:-latest}"
|
||||
|
||||
echo "Building CI runner image..."
|
||||
echo "Image: ${IMAGE_NAME}:${TAG}"
|
||||
echo ""
|
||||
|
||||
# Build the image
|
||||
docker build \
|
||||
-f Dockerfile.ci \
|
||||
-t ${IMAGE_NAME}:${TAG} \
|
||||
.
|
||||
|
||||
echo ""
|
||||
echo "✅ Image built successfully!"
|
||||
echo ""
|
||||
|
||||
# Test the image
|
||||
echo "Testing CI image..."
|
||||
docker run --rm ${IMAGE_NAME}:${TAG} sh -c "
|
||||
echo 'Node.js version:' && node --version
|
||||
echo 'npm version:' && npm --version
|
||||
echo 'Git version:' && git --version
|
||||
echo 'Prisma version:' && npx prisma --version
|
||||
echo ''
|
||||
echo 'Installed packages (top 10):'
|
||||
npm list --depth=0 | head -10
|
||||
"
|
||||
|
||||
echo ""
|
||||
echo "✅ CI image is ready to use!"
|
||||
echo ""
|
||||
echo "To use in GitHub Actions/Gitea Actions:"
|
||||
echo " container:"
|
||||
echo " image: ${IMAGE_NAME}:${TAG}"
|
||||
echo ""
|
||||
echo "To push to registry:"
|
||||
echo " docker tag ${IMAGE_NAME}:${TAG} registry.example.com/${IMAGE_NAME}:${TAG}"
|
||||
echo " docker push registry.example.com/${IMAGE_NAME}:${TAG}"
|
||||
+38
-28
@@ -175,37 +175,47 @@ function main() {
|
||||
console.log(`New version: ${currentVersion} → ${newVersion}`);
|
||||
}
|
||||
|
||||
// Confirm with user
|
||||
const readline = require('readline');
|
||||
const rl = readline.createInterface({
|
||||
input: process.stdin,
|
||||
output: process.stdout
|
||||
});
|
||||
// Confirm with user (or skip if --yes flag is set)
|
||||
if (skipConfirm) {
|
||||
// Update package.json
|
||||
updatePackageJson(newVersion);
|
||||
|
||||
rl.question(`\nApply version ${newVersion}? (y/N) `, (answer) => {
|
||||
if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
|
||||
// Update package.json
|
||||
updatePackageJson(newVersion);
|
||||
|
||||
// Update changelog
|
||||
if (bumpType !== 'custom') {
|
||||
const commits = getCommitsSinceLastTag();
|
||||
updateChangelog(newVersion, commits, bumpType);
|
||||
}
|
||||
|
||||
console.log(`\n✅ Version bumped to ${newVersion}`);
|
||||
console.log(`\nNext steps:`);
|
||||
console.log(` 1. Review changes: git diff`);
|
||||
console.log(` 2. Commit changes: git commit -am "chore: bump version to v${newVersion}"`);
|
||||
console.log(` 3. Create tag: git tag -a v${newVersion} -m "Release v${newVersion}"`);
|
||||
console.log(` 4. Push changes: git push origin main`);
|
||||
console.log(` 5. Push tag: git push origin v${newVersion}`);
|
||||
} else {
|
||||
console.log('❌ Version bump cancelled');
|
||||
// Update changelog
|
||||
if (bumpType !== 'custom') {
|
||||
const commits = getCommitsSinceLastTag();
|
||||
updateChangelog(newVersion, commits, bumpType);
|
||||
}
|
||||
|
||||
rl.close();
|
||||
});
|
||||
console.log(`\n✅ Version bumped to ${newVersion}`);
|
||||
process.exit(0);
|
||||
} else {
|
||||
const readline = require('readline');
|
||||
const rl = readline.createInterface({
|
||||
input: process.stdin,
|
||||
output: process.stdout
|
||||
});
|
||||
|
||||
rl.question(`\nApply version ${newVersion}? (y/N) `, (answer) => {
|
||||
if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
|
||||
// Update package.json
|
||||
updatePackageJson(newVersion);
|
||||
|
||||
// Update changelog
|
||||
if (bumpType !== 'custom') {
|
||||
const commits = getCommitsSinceLastTag();
|
||||
updateChangelog(newVersion, commits, bumpType);
|
||||
}
|
||||
|
||||
console.log(`\n✅ Version bumped to ${newVersion}`);
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.log('❌ Version bump cancelled');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
rl.close();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Run main function
|
||||
|
||||
Reference in New Issue
Block a user