Compare commits
17 Commits
v0.1.1
...
5c9b98a926
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c9b98a926 | |||
| 73ba929e36 | |||
| c9cd00a055 | |||
| 9768ff3517 | |||
| 0343fa91d2 | |||
| b654571a37 | |||
| 0090611994 | |||
| 9416159712 | |||
| d39172ca44 | |||
| cd119694ed | |||
| 3e4e896677 | |||
| 5e2dbbc2be | |||
| da9c6ae70b | |||
| 8cf3f2d401 | |||
| 69abec3b87 | |||
| 92c064c264 | |||
| 59009f0bf7 |
@@ -0,0 +1,91 @@
|
|||||||
|
name: Pull Request
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
unit-tests:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Run unit tests
|
||||||
|
run: npm run test:run
|
||||||
|
|
||||||
|
analyze-bump-type:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: unit-tests
|
||||||
|
if: success()
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Analyze commits for bump type
|
||||||
|
id: bump_type
|
||||||
|
run: |
|
||||||
|
# Get the merge base and PR commits
|
||||||
|
git fetch origin main:main 2>/dev/null || true
|
||||||
|
MERGE_BASE=$(git merge-base HEAD main 2>/dev/null || echo "HEAD~1")
|
||||||
|
|
||||||
|
# Analyze commits in this PR
|
||||||
|
COMMITS=$(git log --oneline ${MERGE_BASE}..HEAD 2>/dev/null || git log --oneline -10)
|
||||||
|
|
||||||
|
echo "Commits in this PR:"
|
||||||
|
echo "$COMMITS"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Determine bump type
|
||||||
|
if echo "$COMMITS" | grep -qE "(BREAKING CHANGE|!:)"; then
|
||||||
|
BUMP="major"
|
||||||
|
REASON="Breaking change detected in commit messages"
|
||||||
|
elif echo "$COMMITS" | grep -qE "^feat"; then
|
||||||
|
BUMP="minor"
|
||||||
|
REASON="Feature commits detected"
|
||||||
|
else
|
||||||
|
BUMP="patch"
|
||||||
|
REASON="Defaulting to patch (fixes or other changes)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Suggested bump type: $BUMP"
|
||||||
|
echo "Reason: $REASON"
|
||||||
|
echo "bump=$BUMP" >> $GITHUB_OUTPUT
|
||||||
|
echo "reason=$REASON" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Comment bump type on PR
|
||||||
|
uses: actions/github-script@v7
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const bump = '${{ steps.bump_type.outputs.bump }}';
|
||||||
|
const reason = '${{ steps.bump_type.outputs.reason }}';
|
||||||
|
|
||||||
|
const comment = `
|
||||||
|
## 🏷️ Version Bump Analysis
|
||||||
|
|
||||||
|
**Suggested bump type:** \`${bump.toUpperCase()}\`
|
||||||
|
**Reason:** ${reason}
|
||||||
|
|
||||||
|
This PR will bump the version to the next ${bump} version when merged.
|
||||||
|
`;
|
||||||
|
|
||||||
|
github.rest.issues.createComment({
|
||||||
|
issue_number: context.issue.number,
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
body: comment
|
||||||
|
});
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: docker.notsosm.art
|
||||||
|
IMAGE_NAME: euchre-camp
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
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
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.GITEA_TOKEN || github.token }}
|
||||||
|
|
||||||
|
- name: Configure Git
|
||||||
|
run: |
|
||||||
|
git config user.name "Gitea Actions"
|
||||||
|
git config user.email "actions@gitea.com"
|
||||||
|
|
||||||
|
- name: Determine version bump type
|
||||||
|
id: bump_type
|
||||||
|
run: |
|
||||||
|
# Get the merge commit message or use commits since last tag
|
||||||
|
MERGE_MSG="${{ github.event.head_commit.message }}"
|
||||||
|
echo "Commit message: $MERGE_MSG"
|
||||||
|
|
||||||
|
# Determine bump type from commit message or commits
|
||||||
|
if echo "$MERGE_MSG" | grep -qE "(BREAKING CHANGE|!:)"; then
|
||||||
|
echo "bump=major" >> $GITHUB_OUTPUT
|
||||||
|
echo "Bump type: major (breaking change detected)"
|
||||||
|
elif echo "$MERGE_MSG" | grep -qE "^feat"; then
|
||||||
|
echo "bump=minor" >> $GITHUB_OUTPUT
|
||||||
|
echo "Bump type: minor (feature detected)"
|
||||||
|
else
|
||||||
|
# Check actual commits in the PR
|
||||||
|
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
|
||||||
|
if [ -n "$LAST_TAG" ]; then
|
||||||
|
COMMITS=$(git log --oneline ${LAST_TAG}..HEAD 2>/dev/null | head -5)
|
||||||
|
else
|
||||||
|
COMMITS=$(git log --oneline | head -5)
|
||||||
|
fi
|
||||||
|
echo "Recent commits: $COMMITS"
|
||||||
|
|
||||||
|
if echo "$COMMITS" | grep -qE "BREAKING\|!:"; then
|
||||||
|
echo "bump=major" >> $GITHUB_OUTPUT
|
||||||
|
echo "Bump type: major (breaking change in commits)"
|
||||||
|
elif echo "$COMMITS" | grep -qE "^feat"; then
|
||||||
|
echo "bump=minor" >> $GITHUB_OUTPUT
|
||||||
|
echo "Bump type: minor (feature in commits)"
|
||||||
|
else
|
||||||
|
echo "bump=patch" >> $GITHUB_OUTPUT
|
||||||
|
echo "Bump type: patch (default)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Bump version
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
BUMP="${{ steps.bump_type.outputs.bump }}"
|
||||||
|
echo "Bumping version: $BUMP"
|
||||||
|
|
||||||
|
# Run the bump script
|
||||||
|
node scripts/bump-version.js "$BUMP" --yes
|
||||||
|
|
||||||
|
# Get new version
|
||||||
|
NEW_VERSION=$(node -p "require('./package.json').version")
|
||||||
|
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
|
||||||
|
echo "New version: $NEW_VERSION"
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
|
- name: Create git tag for release
|
||||||
|
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"
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Build test-capable image
|
||||||
|
run: |
|
||||||
|
docker build \
|
||||||
|
--target test-runner \
|
||||||
|
--build-arg GIT_COMMIT=${{ github.sha }} \
|
||||||
|
-t ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
|
||||||
|
.
|
||||||
|
|
||||||
|
- name: Run tests inside test-capable container
|
||||||
|
run: |
|
||||||
|
docker run --rm \
|
||||||
|
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
|
||||||
|
${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
|
||||||
|
npm run test:run
|
||||||
|
|
||||||
|
- name: Build production image
|
||||||
|
run: |
|
||||||
|
docker build \
|
||||||
|
--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 \
|
||||||
|
.
|
||||||
|
|
||||||
|
- name: Push Docker images
|
||||||
|
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 push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }}
|
||||||
|
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
|
||||||
|
echo "Successfully pushed images to ${{ env.REGISTRY }}"
|
||||||
|
else
|
||||||
|
echo "Warning: Docker login failed with provided credentials"
|
||||||
|
echo "Images built locally but not pushed to registry"
|
||||||
|
echo "Manual push required:"
|
||||||
|
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }}"
|
||||||
|
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Warning: DOCKER_LOGIN or DOCKER_PASSWORD secrets not configured"
|
||||||
|
echo "Images built locally but not pushed to registry"
|
||||||
|
echo "Manual push required:"
|
||||||
|
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }}"
|
||||||
|
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Deploy to dev (placeholder)
|
||||||
|
run: |
|
||||||
|
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
|
||||||
|
# TODO: Add actual deployment steps
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
name: Test
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '**'
|
||||||
|
- '!main' # Skip main branch (release workflow handles that)
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
unit-tests:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Run unit tests
|
||||||
|
run: npm run test:run
|
||||||
|
|
||||||
|
# Acceptance tests that don't require DB read/write
|
||||||
|
# Only run on pull requests to main
|
||||||
|
safe-acceptance-tests:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: unit-tests
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Run safe acceptance tests
|
||||||
|
# These tests should not read/write to the database
|
||||||
|
# They might test UI components, routing, or static content
|
||||||
|
run: npm run test:acceptance -- --grep "safe|static|ui|component"
|
||||||
@@ -1,3 +1,22 @@
|
|||||||
|
## [0.1.2] - 2026-04-01
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 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.1] - 2026-04-01
|
## [0.1.1] - 2026-04-01
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
+22
-1
@@ -26,7 +26,28 @@ RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma genera
|
|||||||
ARG GIT_COMMIT=unknown
|
ARG GIT_COMMIT=unknown
|
||||||
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT npm run build
|
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT npm run build
|
||||||
|
|
||||||
# Stage 2: Runner
|
# Stage 2: Test runner (includes dev dependencies for testing)
|
||||||
|
FROM node:20-alpine AS test-runner
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
RUN apk add --no-cache python3 make g++ git
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy package files
|
||||||
|
COPY package*.json ./
|
||||||
|
|
||||||
|
# Install ALL dependencies (including dev dependencies for testing)
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
|
# Copy source code
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Generate Prisma client
|
||||||
|
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
|
||||||
|
|
||||||
|
# Stage 3: Production runner
|
||||||
FROM node:20-alpine AS runner
|
FROM node:20-alpine AS runner
|
||||||
|
|
||||||
# Install dumb-init for proper signal handling
|
# Install dumb-init for proper signal handling
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "euchre_camp",
|
"name": "euchre_camp",
|
||||||
"version": "0.1.1",
|
"version": "0.1.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ const fs = require('fs');
|
|||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
// Configuration
|
// Configuration
|
||||||
const REGISTRY = 'euchre-camp';
|
const REGISTRY = 'docker.notsosm.art';
|
||||||
const IMAGE_NAME = 'euchre-camp';
|
const IMAGE_NAME = 'euchre-camp';
|
||||||
const FULL_IMAGE_NAME = `${REGISTRY}/${IMAGE_NAME}`;
|
const FULL_IMAGE_NAME = `${REGISTRY}/${IMAGE_NAME}`;
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ const path = require('path');
|
|||||||
// Parse command line arguments
|
// Parse command line arguments
|
||||||
const args = process.argv.slice(2);
|
const args = process.argv.slice(2);
|
||||||
const forcedVersion = args[0]; // e.g., "0.2.0" or "patch/minor/major"
|
const forcedVersion = args[0]; // e.g., "0.2.0" or "patch/minor/major"
|
||||||
|
const skipConfirm = args.includes('--yes') || args.includes('-y'); // Skip confirmation prompt
|
||||||
|
|
||||||
// Paths
|
// Paths
|
||||||
const packageJsonPath = path.join(__dirname, '..', 'package.json');
|
const packageJsonPath = path.join(__dirname, '..', 'package.json');
|
||||||
|
|||||||
@@ -168,13 +168,21 @@ export default function AdminMatchesPage() {
|
|||||||
{match.team2Score}
|
{match.team2Score}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
||||||
<button
|
<div className="flex gap-3">
|
||||||
onClick={() => handleDelete(match.id)}
|
<Link
|
||||||
disabled={deletingId === match.id}
|
href={`/matches/${match.id}`}
|
||||||
className="text-red-600 hover:text-red-900 disabled:opacity-50"
|
className="text-blue-600 hover:text-blue-900"
|
||||||
>
|
>
|
||||||
{deletingId === match.id ? "Deleting..." : "Delete"}
|
View
|
||||||
</button>
|
</Link>
|
||||||
|
<button
|
||||||
|
onClick={() => handleDelete(match.id)}
|
||||||
|
disabled={deletingId === match.id}
|
||||||
|
className="text-red-600 hover:text-red-900 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{deletingId === match.id ? "Deleting..." : "Delete"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
|
|||||||
Reference in New Issue
Block a user