Compare commits
18 Commits
v0.1.3
..
e303955599
| Author | SHA1 | Date | |
|---|---|---|---|
| e303955599 | |||
| fa6c4369a6 | |||
| 9c884ee020 | |||
| 5b91cf1426 | |||
| 00373fcef4 | |||
| 80714a5daa | |||
| 039b927bb7 | |||
| 9511eed477 | |||
| 0e1046fcb5 | |||
| 5f02726ba6 | |||
| e08d72bfe6 | |||
| 9980021037 | |||
| 6b70c3f388 | |||
| ff7461973a | |||
| 9b69cb84e3 | |||
| 5c9b98a926 | |||
| 73ba929e36 | |||
| c9cd00a055 |
@@ -13,6 +13,10 @@ 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
|
||||||
|
|
||||||
@@ -26,7 +30,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: unit-tests
|
needs: unit-tests
|
||||||
container:
|
container:
|
||||||
image: mcr.microsoft.com/playwright:v1.58.0-jammy
|
image: node:20-alpine
|
||||||
options: --user root
|
options: --user root
|
||||||
env:
|
env:
|
||||||
DATABASE_PROVIDER: sqlite
|
DATABASE_PROVIDER: sqlite
|
||||||
@@ -34,21 +38,18 @@ 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: |
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.GITEA_TOKEN || github.token }}
|
|
||||||
|
|
||||||
- name: Configure Git
|
- name: Configure Git
|
||||||
run: |
|
run: |
|
||||||
@@ -78,38 +77,22 @@ 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
|
||||||
if git diff --cached --quiet; then
|
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
|
||||||
echo "No changes to commit (version may already be at target version)"
|
git push origin main
|
||||||
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"
|
||||||
# Check if tag already exists
|
git push origin "$TAG_NAME"
|
||||||
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 \
|
||||||
@@ -118,7 +101,6 @@ 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" \
|
||||||
@@ -126,7 +108,6 @@ 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 \
|
||||||
@@ -136,32 +117,16 @@ 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 registry..."
|
||||||
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
|
# Note: Docker registry credentials should be configured in Gitea secrets
|
||||||
if [ -n "${{ secrets.DOCKER_LOGIN }}" ] && [ -n "${{ secrets.DOCKER_PASSWORD }}" ]; then
|
# For now, just show the manual push commands
|
||||||
if docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} -p ${{ secrets.DOCKER_PASSWORD }} 2>/dev/null; then
|
echo "Images built locally but not pushed to registry"
|
||||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }}
|
echo "Manual push required:"
|
||||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
|
echo " docker push docker.notsosm.art/euchre-camp:${{ steps.version.outputs.new_version }}"
|
||||||
echo "Successfully pushed images to ${{ env.REGISTRY }}"
|
echo " docker push docker.notsosm.art/euchre-camp:latest"
|
||||||
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)
|
- 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,6 +15,10 @@ 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,29 +127,6 @@ 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,28 +1,3 @@
|
|||||||
## [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,27 +368,10 @@ 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,8 +246,6 @@ 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.3",
|
"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",
|
||||||
|
|||||||
+29
-47
@@ -48,22 +48,14 @@ function getCommitsSinceLastTag() {
|
|||||||
|
|
||||||
if (!latestTag) {
|
if (!latestTag) {
|
||||||
// No tags yet, get all commits
|
// No tags yet, get all commits
|
||||||
const commits = execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim();
|
return execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim().split('\n');
|
||||||
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
|
||||||
try {
|
return execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim().split('\n');
|
||||||
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 [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,47 +175,37 @@ function main() {
|
|||||||
console.log(`New version: ${currentVersion} → ${newVersion}`);
|
console.log(`New version: ${currentVersion} → ${newVersion}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Confirm with user (or skip if --yes flag is set)
|
// Confirm with user
|
||||||
if (skipConfirm) {
|
const readline = require('readline');
|
||||||
// Update package.json
|
const rl = readline.createInterface({
|
||||||
updatePackageJson(newVersion);
|
input: process.stdin,
|
||||||
|
output: process.stdout
|
||||||
|
});
|
||||||
|
|
||||||
// Update changelog
|
rl.question(`\nApply version ${newVersion}? (y/N) `, (answer) => {
|
||||||
if (bumpType !== 'custom') {
|
if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
|
||||||
const commits = getCommitsSinceLastTag();
|
// Update package.json
|
||||||
updateChangelog(newVersion, commits, bumpType);
|
updatePackageJson(newVersion);
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`\n✅ Version bumped to ${newVersion}`);
|
// Update changelog
|
||||||
process.exit(0);
|
if (bumpType !== 'custom') {
|
||||||
} else {
|
const commits = getCommitsSinceLastTag();
|
||||||
const readline = require('readline');
|
updateChangelog(newVersion, commits, bumpType);
|
||||||
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();
|
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();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run main function
|
// Run main function
|
||||||
|
|||||||
Reference in New Issue
Block a user