3 Commits

Author SHA1 Message Date
david 5c9b98a926 feat: add PR workflow with bump type analysis
Test / unit-tests (push) Has been cancelled
Test / safe-acceptance-tests (push) Has been cancelled
Test / unit-tests (pull_request) Failing after 11m39s
Pull Request / unit-tests (pull_request) Failing after 16m27s
Pull Request / analyze-bump-type (pull_request) Has been cancelled
Test / safe-acceptance-tests (pull_request) Has been cancelled
2026-03-31 20:01:41 -07:00
david 73ba929e36 fix: update release workflow to bump version on PR merge 2026-03-31 20:01:24 -07:00
david c9cd00a055 fix: handle existing git tags and use DOCKER_LOGIN/DOCKER_PASSWORD secrets 2026-03-31 19:58:43 -07:00
5 changed files with 199 additions and 28 deletions
+91
View File
@@ -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
});
+85 -25
View File
@@ -10,8 +10,9 @@ env:
IMAGE_NAME: euchre-camp IMAGE_NAME: euchre-camp
jobs: jobs:
build-and-test: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# Skip if this is an auto-generated version bump commit
if: "!contains(github.event.head_commit.message, 'chore: bump version')" if: "!contains(github.event.head_commit.message, 'chore: bump version')"
steps: steps:
@@ -19,14 +20,75 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN || github.token }}
- name: Get current version - 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 id: version
run: | run: |
# Read version from package.json BUMP="${{ steps.bump_type.outputs.bump }}"
CURRENT_VERSION=$(node -p "require('./package.json').version") echo "Bumping version: $BUMP"
echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
echo "Current version: $CURRENT_VERSION" # 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 - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
@@ -36,14 +98,14 @@ jobs:
docker build \ docker build \
--target test-runner \ --target test-runner \
--build-arg GIT_COMMIT=${{ github.sha }} \ --build-arg GIT_COMMIT=${{ github.sha }} \
-t ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.version }} \ -t ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
. .
- name: Run tests inside test-capable container - name: Run tests inside test-capable container
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" \
${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.version }} \ ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
npm run test:run npm run test:run
- name: Build production image - name: Build production image
@@ -51,37 +113,35 @@ jobs:
docker build \ docker build \
--target runner \ --target runner \
--build-arg GIT_COMMIT=${{ github.sha }} \ --build-arg GIT_COMMIT=${{ github.sha }} \
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }} \
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
. .
- name: Configure Git
run: |
git config user.name "Gitea Actions"
git config user.email "actions@gitea.com"
- name: Create git tag for release
run: |
git tag -a "v${{ steps.version.outputs.version }}" -m "Release v${{ steps.version.outputs.version }}"
git push origin "v${{ steps.version.outputs.version }}"
- name: Push Docker images - name: Push Docker images
run: | run: |
echo "Pushing to ${{ env.REGISTRY }}..." echo "Pushing to ${{ env.REGISTRY }}..."
# Check if we can authenticate to the registry # Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
if docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} 2>/dev/null; then if [ -n "${{ secrets.DOCKER_LOGIN }}" ] && [ -n "${{ secrets.DOCKER_PASSWORD }}" ]; then
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }} 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 docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
echo "Successfully pushed images to ${{ env.REGISTRY }}" echo "Successfully pushed images to ${{ env.REGISTRY }}"
else else
echo "Warning: Could not authenticate to ${{ env.REGISTRY }}" echo "Warning: Docker login failed with provided credentials"
echo "Images built locally but not pushed to registry" echo "Images built locally but not pushed to registry"
echo "Manual push required:" echo "Manual push required:"
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}" 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" echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
fi fi
- name: Deploy to dev (placeholder) - name: Deploy to dev (placeholder)
run: | run: |
echo "Deploying version ${{ steps.version.outputs.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
+19
View File
@@ -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
+1 -1
View File
@@ -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",
+1
View File
@@ -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');