diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml deleted file mode 100644 index 14b3f74..0000000 --- a/.github/workflows/backport.yml +++ /dev/null @@ -1,71 +0,0 @@ -name: Backport to develop - -on: - pull_request: - types: [closed] - branches: - - main - -jobs: - backport: - runs-on: ubuntu-latest - # Solo si el PR fue mergeado - if: github.event.pull_request.merged == true - - permissions: - contents: write - pull-requests: write - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Config git - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - - name: Crear branch de backport y cherry-pick - env: - TARGET_BRANCH: develop - PR_NUMBER: ${{ github.event.pull_request.number }} - MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }} - run: | - BACKPORT_BRANCH=backport/pr-${PR_NUMBER}-to-${TARGET_BRANCH} - - # Traer develop - git fetch origin ${TARGET_BRANCH} - git checkout -b ${BACKPORT_BRANCH} origin/${TARGET_BRANCH} - - # Cherry-pick del merge de main - git cherry-pick -m 1 -x ${MERGE_SHA} - - git push origin ${BACKPORT_BRANCH} - - - name: Crear PR hacia develop - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_NUMBER: ${{ github.event.pull_request.number }} - MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }} - PR_TITLE: ${{ github.event.pull_request.title }} - run: | - BACKPORT_BRANCH=backport/pr-${PR_NUMBER}-to-develop - - PR_BODY="🔄 Backport automático de #${PR_NUMBER} a \`develop\`. - - **PR original:** #${PR_NUMBER} - **Título:** ${PR_TITLE} - **Commit:** ${MERGE_SHA} - - --- - _Este PR fue creado automáticamente por el workflow de backport._" - - gh pr create \ - --base develop \ - --head ${BACKPORT_BRANCH} \ - --title "Backport #${PR_NUMBER} to develop" \ - --body "${PR_BODY}" \ - --label backport diff --git a/CHANGELOG.md b/CHANGELOG.md index 09ae0d4..dfc3c02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.3.1] - 2024-12-13 + +### Fixed +- Hotfix: Removed problematic backport workflow that was causing deployment failures + - Backport action had recurring merge conflict issues + - Workflow temporarily disabled until a more robust solution is implemented + +## [1.3.0] - 2024-12-11 + ### Added - Enhanced transaction notifications with detailed information - Shows amount, currency, category, and date in success notifications @@ -18,11 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Most recently created transactions appear first within each date - Uses transaction ID for consistent ordering -### Fixed -- Backport workflow now correctly creates PRs to develop branch - - Changed from `peter-evans/create-pull-request` to GitHub CLI - - Properly handles already-pushed branches - ## [1.2.0] - 2024-12-11 ### Added @@ -107,7 +111,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - React Router for navigation - Recharts for data visualization -[Unreleased]: https://github.com/tomas2305/platito/compare/1.2.0...HEAD +[Unreleased]: https://github.com/tomas2305/platito/compare/1.3.1...HEAD +[1.3.1]: https://github.com/tomas2305/platito/compare/1.3.0...1.3.1 +[1.3.0]: https://github.com/tomas2305/platito/compare/1.2.0...1.3.0 [1.2.0]: https://github.com/tomas2305/platito/compare/1.1.1...1.2.0 [1.1.1]: https://github.com/tomas2305/platito/compare/1.1.0...1.1.1 [1.1.0]: https://github.com/tomas2305/platito/compare/1.0.0...1.1.0 diff --git a/package.json b/package.json index b3cd988..ef62949 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "platito", "private": true, - "version": "1.2.0", + "version": "1.3.3", "type": "module", "scripts": { "dev": "vite", diff --git a/src/components/TransactionList.tsx b/src/components/TransactionList.tsx index 72cc506..d924701 100644 --- a/src/components/TransactionList.tsx +++ b/src/components/TransactionList.tsx @@ -252,7 +252,7 @@ export const TransactionList = ({ {groupKeys.map((dateKey) => ( - {formatDateHeader(dateKey)} + {formatDateHeader(dateKey)} {grouped[dateKey].map((tx) => { const account = accountMap.get(tx.accountId); const category = categoryMap.get(tx.categoryId);