diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 777c426..450e519 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -119,6 +119,13 @@ jobs: git push fi + - name: Get previous tag + id: previous_tag + run: | + PREVIOUS_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") + echo "tag=$PREVIOUS_TAG" >> $GITHUB_OUTPUT + echo "Previous tag: $PREVIOUS_TAG" + - name: Create Git tag run: | git tag "v${{ steps.new_version.outputs.version }}" @@ -129,8 +136,8 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - # Get the date of the previous tag so we can filter PRs merged after it - PREVIOUS_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") + # Use the previous tag captured before the new tag was created + PREVIOUS_TAG="${{ steps.previous_tag.outputs.tag }}" if [ -z "$PREVIOUS_TAG" ]; then SINCE_DATE="2000-01-01T00:00:00Z" @@ -144,6 +151,7 @@ jobs: PRS=$(gh pr list \ --state merged \ --base main \ + --limit 200 \ --json number,title,body,mergedAt,author \ --jq "sort_by(.mergedAt) | [.[] | select(.mergedAt > \"$SINCE_DATE\")]") @@ -151,14 +159,20 @@ jobs: echo "Found $PR_COUNT pull request(s)" # Build the changelog file - echo "## Changes in v${{ steps.new_version.outputs.version }}" > /tmp/changelog.md + echo "## What's Changed in v${{ steps.new_version.outputs.version }}" > /tmp/changelog.md echo "" >> /tmp/changelog.md if [ "$PR_COUNT" -eq 0 ]; then echo "_No pull requests found since the last release._" >> /tmp/changelog.md else - echo "$PRS" | jq -r '.[] | "### [#\(.number)] \(.title)\n\n\(if .body and (.body | length) > 0 then .body else "_No description provided._" end)\n\n---\n"' \ + echo "$PRS" | jq -r '.[] | "### [#\(.number)] \(.title)\n\n**Author:** @\(.author.login)\n\n\(if .body and (.body | length) > 0 then .body else "_No description provided._" end)\n\n---\n"' \ >> /tmp/changelog.md + + # Append unique contributors section + echo "" >> /tmp/changelog.md + echo "## Contributors" >> /tmp/changelog.md + echo "" >> /tmp/changelog.md + echo "$PRS" | jq -r '[.[].author.login] | unique | sort | .[] | "- @\(.)"' >> /tmp/changelog.md fi # Save to output (multiline) @@ -170,7 +184,7 @@ jobs: uses: softprops/action-gh-release@v1 with: tag_name: v${{ steps.new_version.outputs.version }} - name: Release v${{ steps.new_version.outputs.version }} + name: v${{ steps.new_version.outputs.version }} body: ${{ steps.changelog.outputs.content }} draft: false prerelease: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0bb273a..f9e5b43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ on: jobs: test: - if: ${{ !(github.event_name == 'push' && github.actor == 'github-actions[bot]' && startsWith(github.event.head_commit.message, 'chore: bump version to ')) }} + if: "${{ !(github.event_name == 'push' && github.actor == 'github-actions[bot]' && startsWith(github.event.head_commit.message, 'chore: bump version to ')) }}" runs-on: ubuntu-latest strategy: @@ -44,11 +44,6 @@ jobs: VITE_SUPABASE_URL: https://test.supabase.co VITE_SUPABASE_ANON_KEY: test-key - - name: Build iOS project - run: npm run build:ios - env: - VITE_IOS_BUILD: "true" - - name: Upload test results if: always() uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index 653b55e..14a2a11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .worktrees node_modules dist +dev-dist .env .env.local .env.development.local diff --git a/dev-dist/sw.js b/dev-dist/sw.js index 0c2c978..3531e55 100644 --- a/dev-dist/sw.js +++ b/dev-dist/sw.js @@ -79,7 +79,7 @@ define(['./workbox-21a80088'], (function (workbox) { 'use strict'; */ workbox.precacheAndRoute([{ "url": "index.html", - "revision": "0.u5tkfl26p2g" + "revision": "0.febhrpu4fe" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {