6 Commits

Author SHA1 Message Date
Gitea Actions ec3297befe chore: bump version to v0.1.3 2026-04-01 06:31:42 +00:00
david f4aca275de fix: skip release steps if no version bump commit was made
Pull Request / unit-tests (pull_request) Successful in 2m4s
Pull Request / acceptance-tests (pull_request) Failing after 2m17s
Pull Request / analyze-bump-type (pull_request) Has been skipped
Test / unit-tests (push) Successful in 2m38s
Release / release (push) Failing after 7m25s
- Set output variable 'committed' in commit step
- Add conditional execution to all subsequent steps
- Only create tag, build Docker images, and deploy if commit was successful
2026-03-31 23:23:01 -07:00
david fe133eab99 fix: improve error handling in getCommitsSinceLastTag
- Add nested try-catch to handle git log failures
- Return empty array if all git attempts fail
- Add warning message when commit history cannot be retrieved
2026-03-31 23:22:38 -07:00
david 89d0d08162 fix: add tag existence check in release workflow
Test / unit-tests (push) Successful in 2m22s
- Check if tag already exists before creating it
- Skip tag creation if tag already exists
2026-03-31 23:19:31 -07:00
david fe18a8b9fe fix: resolve release workflow version bump issues
- Fixed bump-version.js to properly handle --yes flag in CI environments
- Added check to skip commit if no changes to package.json or CHANGELOG.md
- Ensured script exits cleanly after version bump with --yes flag
2026-03-31 23:19:31 -07:00
david 6b9b690947 ci-image-improvements (#18)
Release / release (push) Failing after 1m7s
Test / unit-tests (push) Successful in 2m22s
Reviewed-on: #18
Co-authored-by: David Gwilliam <dhgwilliam@gmail.com>
Co-committed-by: David Gwilliam <dhgwilliam@gmail.com>
2026-04-01 06:14:25 +00:00
12 changed files with 151 additions and 272 deletions
-80
View File
@@ -1,80 +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 your existing Docker registry
REGISTRY: docker.notsosm.art
IMAGE_NAME: euchre-camp-ci-runner
jobs:
build-ci-image:
runs-on: ubuntu-latest
# Skip if this is an auto-generated version bump commit
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build CI image
run: |
docker build \
-f Dockerfile.ci \
-t ${{ env.IMAGE_NAME }}:latest \
-t ${{ env.IMAGE_NAME }}:$(git rev-parse --short HEAD) \
.
- name: Test CI image
run: |
docker run --rm \
${{ env.IMAGE_NAME }}:latest \
sh -c "node --version && npm --version && npx prisma --version"
- name: Push to registry
run: |
echo "Pushing to ${{ env.REGISTRY }}..."
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
if [ -n "${{ secrets.DOCKER_LOGIN }}" ] && [ -n "${{ secrets.DOCKER_PASSWORD }}" ]; then
if docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} -p ${{ secrets.DOCKER_PASSWORD }} 2>/dev/null; then
docker tag ${{ env.IMAGE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
echo "Successfully pushed CI image to ${{ env.REGISTRY }}"
else
echo "Warning: Docker login failed with provided credentials"
echo "CI image built locally but not pushed to registry"
fi
else
echo "Warning: DOCKER_LOGIN or DOCKER_PASSWORD secrets not configured"
echo "CI image built locally but not pushed to registry"
fi
- name: Show usage instructions
run: |
echo "CI Image built successfully!"
echo ""
echo "To use in workflows:"
echo " container:"
echo " image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
+16 -12
View File
@@ -9,19 +9,15 @@ jobs:
unit-tests:
runs-on: ubuntu-latest
container:
image: docker.notsosm.art/euchre-camp-ci-runner:latest
image: node:20-alpine
options: --user root
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Link node_modules from container
run: |
# Create symlink to pre-installed node_modules in container
# Container has node_modules at /workspace/node_modules
# Gitea Actions checks out at /workspace/david/euchre_camp
ln -sf /workspace/node_modules ./node_modules
- name: Install dependencies
run: npm ci
- name: Run unit tests
run: npm run test:run
@@ -30,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
needs: unit-tests
container:
image: docker.notsosm.art/euchre-camp-ci-runner:latest
image: mcr.microsoft.com/playwright:v1.58.0-jammy
options: --user root
env:
DATABASE_PROVIDER: sqlite
@@ -41,10 +37,18 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Link node_modules from container
run: |
# Create symlink to pre-installed node_modules in container
ln -sf /workspace/node_modules ./node_modules
- 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: |
+24 -4
View File
@@ -78,22 +78,38 @@ jobs:
echo "New version: $NEW_VERSION"
- name: Commit version bump
id: commit
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)"
echo "committed=false" >> $GITHUB_OUTPUT
else
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
git push origin main
echo "committed=true" >> $GITHUB_OUTPUT
fi
- name: Create git tag for release
if: steps.commit.outputs.committed == 'true'
run: |
TAG_NAME="v${{ steps.version.outputs.new_version }}"
echo "Creating tag $TAG_NAME"
git tag -a "$TAG_NAME" -m "Release $TAG_NAME"
git push origin "$TAG_NAME"
# Check if tag already exists
if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
echo "Tag $TAG_NAME already exists, skipping tag creation"
else
git tag -a "$TAG_NAME" -m "Release $TAG_NAME"
git push origin "$TAG_NAME"
fi
- name: Set up Docker Buildx
if: steps.commit.outputs.committed == 'true'
uses: docker/setup-buildx-action@v3
- name: Build test-capable image
if: steps.commit.outputs.committed == 'true'
run: |
docker build \
--target test-runner \
@@ -102,6 +118,7 @@ jobs:
.
- name: Run tests inside test-capable container
if: steps.commit.outputs.committed == 'true'
run: |
docker run --rm \
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
@@ -109,6 +126,7 @@ jobs:
npm run test:run
- name: Build production image
if: steps.commit.outputs.committed == 'true'
run: |
docker build \
--target runner \
@@ -118,6 +136,7 @@ jobs:
.
- name: Push Docker images
if: steps.commit.outputs.committed == 'true'
run: |
echo "Pushing to ${{ env.REGISTRY }}..."
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
@@ -142,6 +161,7 @@ jobs:
fi
- name: Deploy to dev (placeholder)
if: steps.commit.outputs.committed == 'true'
run: |
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
# TODO: Add actual deployment steps
+3 -5
View File
@@ -9,7 +9,7 @@ jobs:
unit-tests:
runs-on: ubuntu-latest
container:
image: docker.notsosm.art/euchre-camp-ci-runner:latest
image: node:20-alpine
options: --user root
# Skip if this is an auto-generated version bump commit (handled by release workflow)
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
@@ -18,10 +18,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Link node_modules from container
run: |
# Create symlink to pre-installed node_modules in container
ln -sf /workspace/node_modules ./node_modules
- name: Install dependencies
run: npm ci
- name: Run unit tests
run: npm run test:run
+17 -14
View File
@@ -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:
+25
View File
@@ -1,3 +1,28 @@
## [0.1.3] - 2026-04-01
### Patch Changes
- fix: skip release steps if no version bump commit was made
- fix: improve error handling in getCommitsSinceLastTag
- fix: add tag existence check in release workflow
- fix: resolve release workflow version bump issues
- ci-image-improvements (#18)
- fix: version bumping and Docker registry authentication (#17)
- fix: handle Docker registry authentication gracefully in release workflow
- fix: run unit tests on branch commits, skip main branch
- feat: add test workflow for every commit
- trigger: release with test-capable image
- feat: build test-capable image, run tests, then build production image
- trigger: release workflow
- fix: release workflow should not commit, only tag
- trigger: manual workflow trigger for docker.notsosm.art
- fix: update Docker build script to use docker.notsosm.art registry
- fix: update workflow to use docker.notsosm.art registry
- trigger: manual workflow trigger
- fix: update workflow to use correct Docker registries
- feat: add Gitea Actions release workflow
- feat: add view match link to admin matches page
## [0.1.2] - 2026-04-01
### Patch Changes
-46
View File
@@ -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 /workspace
# 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"]
+15 -26
View File
@@ -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
+2 -10
View File
@@ -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 -1
View File
@@ -1,6 +1,6 @@
{
"name": "euchre_camp",
"version": "0.1.2",
"version": "0.1.3",
"private": true,
"scripts": {
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
-44
View File
@@ -1,44 +0,0 @@
#!/bin/bash
# Build and test the CI runner image locally
set -e
IMAGE_NAME="euchre-camp-ci-runner"
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: docker.notsosm.art/${IMAGE_NAME}:${TAG}"
echo ""
echo "To push to registry:"
echo " docker tag ${IMAGE_NAME}:${TAG} docker.notsosm.art/${IMAGE_NAME}:${TAG}"
echo " docker push docker.notsosm.art/${IMAGE_NAME}:${TAG}"
+48 -30
View File
@@ -48,14 +48,22 @@ function getCommitsSinceLastTag() {
if (!latestTag) {
// No tags yet, get all commits
return execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim().split('\n');
const commits = execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : [];
}
const commits = execSync(`git log ${latestTag}..HEAD --oneline --format=%s`, { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : [];
} catch (error) {
// If no commits since tag or other error, get recent commits
return execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim().split('\n');
try {
const commits = execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : [];
} catch (innerError) {
// If all git log attempts fail, return empty array
console.warn('Warning: Could not retrieve commit history, defaulting to patch version');
return [];
}
}
}
@@ -175,37 +183,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