Compare commits
6 Commits
ba180ae6e1
...
v0.1.3
| Author | SHA1 | Date | |
|---|---|---|---|
| ec3297befe | |||
| f4aca275de | |||
| fe133eab99 | |||
| 89d0d08162 | |||
| fe18a8b9fe | |||
| 6b9b690947 |
@@ -13,10 +13,6 @@ jobs:
|
|||||||
options: --user root
|
options: --user root
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
apk add --no-cache bash git
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
@@ -30,7 +26,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: unit-tests
|
needs: unit-tests
|
||||||
container:
|
container:
|
||||||
image: node:20-alpine
|
image: mcr.microsoft.com/playwright:v1.58.0-jammy
|
||||||
options: --user root
|
options: --user root
|
||||||
env:
|
env:
|
||||||
DATABASE_PROVIDER: sqlite
|
DATABASE_PROVIDER: sqlite
|
||||||
@@ -38,18 +34,21 @@ jobs:
|
|||||||
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
|
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
apk add --no-cache bash git
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
|
||||||
- name: Generate Prisma client
|
- name: Generate Prisma client
|
||||||
run: npx prisma generate
|
run: npx prisma generate
|
||||||
|
env:
|
||||||
|
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||||
|
|
||||||
- name: Setup SQLite database
|
- name: Setup SQLite database
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -78,22 +78,38 @@ jobs:
|
|||||||
echo "New version: $NEW_VERSION"
|
echo "New version: $NEW_VERSION"
|
||||||
|
|
||||||
- name: Commit version bump
|
- name: Commit version bump
|
||||||
|
id: commit
|
||||||
run: |
|
run: |
|
||||||
git add package.json CHANGELOG.md
|
git add package.json CHANGELOG.md
|
||||||
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
|
if git diff --cached --quiet; then
|
||||||
git push origin main
|
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
|
- name: Create git tag for release
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
TAG_NAME="v${{ steps.version.outputs.new_version }}"
|
TAG_NAME="v${{ steps.version.outputs.new_version }}"
|
||||||
echo "Creating tag $TAG_NAME"
|
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
|
- name: Set up Docker Buildx
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Build test-capable image
|
- name: Build test-capable image
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
docker build \
|
docker build \
|
||||||
--target test-runner \
|
--target test-runner \
|
||||||
@@ -102,6 +118,7 @@ jobs:
|
|||||||
.
|
.
|
||||||
|
|
||||||
- name: Run tests inside test-capable container
|
- name: Run tests inside test-capable container
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
|
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
|
||||||
@@ -109,6 +126,7 @@ jobs:
|
|||||||
npm run test:run
|
npm run test:run
|
||||||
|
|
||||||
- name: Build production image
|
- name: Build production image
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
docker build \
|
docker build \
|
||||||
--target runner \
|
--target runner \
|
||||||
@@ -118,6 +136,7 @@ jobs:
|
|||||||
.
|
.
|
||||||
|
|
||||||
- name: Push Docker images
|
- name: Push Docker images
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Pushing to ${{ env.REGISTRY }}..."
|
echo "Pushing to ${{ env.REGISTRY }}..."
|
||||||
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
|
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
|
||||||
@@ -142,6 +161,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Deploy to dev (placeholder)
|
- name: Deploy to dev (placeholder)
|
||||||
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
|
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
|
||||||
# TODO: Add actual deployment steps
|
# TODO: Add actual deployment steps
|
||||||
|
|||||||
@@ -15,10 +15,6 @@ jobs:
|
|||||||
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
|
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
apk add --no-cache bash git
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -127,6 +127,29 @@ npm run db:setup-postgres
|
|||||||
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
|
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### CI Runner Image
|
||||||
|
|
||||||
|
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
**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
|
||||||
|
|
||||||
|
**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
|
### CI/CD Pipeline
|
||||||
The project uses Gitea Actions for continuous integration:
|
The project uses Gitea Actions for continuous integration:
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
## [0.1.2] - 2026-04-01
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
@@ -368,10 +368,27 @@ The application uses Gitea Actions for continuous integration and deployment:
|
|||||||
- Unit tests for quick feedback
|
- Unit tests for quick feedback
|
||||||
- Skips auto-generated version bumps
|
- Skips auto-generated version bumps
|
||||||
|
|
||||||
3. **Release Workflow** (`.gitea/workflows/release.yml`): Runs on main branch pushes
|
3. **Release Workflow** (`.gitea/workflows/release.yml`): Runs on main branch pushes
|
||||||
- Version bumping and tagging
|
- Version bumping and tagging
|
||||||
- Docker image building and testing
|
- Docker image building and testing
|
||||||
- Registry push and deployment
|
- Registry push and deployment
|
||||||
|
|
||||||
|
### CI Runner Image
|
||||||
|
|
||||||
|
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
**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
|
||||||
|
|
||||||
|
**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
|
### Database Strategy for CI
|
||||||
- **CI Tests**: SQLite database (fast, no server required)
|
- **CI Tests**: SQLite database (fast, no server required)
|
||||||
|
|||||||
@@ -246,6 +246,8 @@ workflow-status:
|
|||||||
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
@echo "PR Workflow: Runs unit + acceptance tests on pull requests"
|
||||||
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
@echo "Test Workflow: Runs unit tests on all branch pushes"
|
||||||
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
|
@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
|
# Check current database provider
|
||||||
db-status:
|
db-status:
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "euchre_camp",
|
"name": "euchre_camp",
|
||||||
"version": "0.1.2",
|
"version": "0.1.3",
|
||||||
"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",
|
||||||
|
|||||||
+48
-30
@@ -48,14 +48,22 @@ function getCommitsSinceLastTag() {
|
|||||||
|
|
||||||
if (!latestTag) {
|
if (!latestTag) {
|
||||||
// No tags yet, get all commits
|
// 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();
|
const commits = execSync(`git log ${latestTag}..HEAD --oneline --format=%s`, { encoding: 'utf8' }).trim();
|
||||||
return commits ? commits.split('\n') : [];
|
return commits ? commits.split('\n') : [];
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// If no commits since tag or other error, get recent commits
|
// 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}`);
|
console.log(`New version: ${currentVersion} → ${newVersion}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Confirm with user
|
// Confirm with user (or skip if --yes flag is set)
|
||||||
const readline = require('readline');
|
if (skipConfirm) {
|
||||||
const rl = readline.createInterface({
|
// Update package.json
|
||||||
input: process.stdin,
|
updatePackageJson(newVersion);
|
||||||
output: process.stdout
|
|
||||||
});
|
|
||||||
|
|
||||||
rl.question(`\nApply version ${newVersion}? (y/N) `, (answer) => {
|
// Update changelog
|
||||||
if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
|
if (bumpType !== 'custom') {
|
||||||
// Update package.json
|
const commits = getCommitsSinceLastTag();
|
||||||
updatePackageJson(newVersion);
|
updateChangelog(newVersion, commits, bumpType);
|
||||||
|
|
||||||
// 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');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
// Run main function
|
||||||
|
|||||||
Reference in New Issue
Block a user