Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8f7f494
ci: add github action workflow for automatic backmerge to develop branch
ryanaidilp Sep 8, 2025
05d2b27
feat: add changelog generation script and release automation workflow
ryanaidilp Sep 8, 2025
99f59c7
fix: update backmerge PR titles to use conventional commit style
ryanaidilp Sep 8, 2025
a2f029c
feat: include version in backmerge PR titles
ryanaidilp Sep 8, 2025
ecafbf5
feat: add comprehensive deployment system with health checks and roll…
ryanaidilp Sep 8, 2025
b02bd08
Merge pull request #1 from banua-coder/feature/github-workflow-setup
ryanaidilp Sep 8, 2025
073591f
feat: implement comprehensive responsive design and mobile navigation
ryanaidilp Sep 8, 2025
25ee3b8
fix: update data source URLs to correct endpoints
ryanaidilp Sep 8, 2025
136a545
fix: resolve CSS conflict in DataSources component
ryanaidilp Sep 8, 2025
49f042a
feat: create reusable Navigation component with mobile support
ryanaidilp Sep 8, 2025
3f1961d
fix: update branding and contact links
ryanaidilp Sep 8, 2025
95ed65b
feat: add MIT license and API source code reference
ryanaidilp Sep 8, 2025
17c22a2
docs: update README with MIT license and API source references
ryanaidilp Sep 8, 2025
62dc3d6
Merge pull request #2 from banua-coder/feature/update-web-responsiveness
ryanaidilp Sep 8, 2025
94f6aab
feat: implement comprehensive national endpoint documentation
ryanaidilp Sep 8, 2025
3d09518
fix: update API response examples to match actual response structure
ryanaidilp Sep 8, 2025
71dcbee
style: add trailing newlines to all code files
ryanaidilp Sep 8, 2025
7b7f287
feat: redesign Documentation page with sidebar layout
ryanaidilp Sep 8, 2025
0685343
Fix mobile layout spacing and improve Coming Soon styling
ryanaidilp Sep 8, 2025
5eed45c
Refactor Documentation into subcomponents and add Glossary
ryanaidilp Sep 8, 2025
2ea7fde
Add Indonesian COVID-19 terminology to glossary
ryanaidilp Sep 8, 2025
98933e0
Add Rt formula, references, and Vue i18n internationalization
ryanaidilp Sep 8, 2025
0aff2ef
Fix i18n implementation in GlossarySection component
ryanaidilp Sep 8, 2025
031088b
Fix glossary section by removing broken i18n implementation
ryanaidilp Sep 8, 2025
495256f
Add LaTeX rendering for mathematical formulas in Rt calculation
ryanaidilp Sep 8, 2025
cc77722
Fix LaTeX rendering and clean up duplicate i18n setup
ryanaidilp Sep 8, 2025
c24cc38
feat: implement complete i18n translations for documentation sections
ryanaidilp Sep 8, 2025
5aea6af
Merge pull request #3 from banua-coder/feature/update-documentation-n…
ryanaidilp Sep 8, 2025
5edb93c
fix: handle multiline commit messages in changelog generation for fir…
ryanaidilp Sep 8, 2025
c197f16
fix: create separate branch for release preparation to avoid conflicts
ryanaidilp Sep 8, 2025
9def93f
chore(release): prepare release v1.0.0
github-actions[bot] Sep 8, 2025
f868eb1
Merge pull request #4 from banua-coder/chore/prepare-release-v1.0.0
ryanaidilp Sep 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 203 additions & 0 deletions .github/workflows/backmerge-to-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
name: Backmerge to Develop

on:
pull_request:
types: [closed]
branches:
- main

jobs:
backmerge:
# Only run if PR was merged (not just closed) and came from release/* or hotfix/* branch
if: |
github.event.pull_request.merged == true &&
(startsWith(github.event.pull_request.head.ref, 'release/') ||
startsWith(github.event.pull_request.head.ref, 'hotfix/'))

runs-on: ubuntu-latest

permissions:
contents: write
pull-requests: write

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all history for all branches
token: ${{ secrets.GITHUB_TOKEN }}

- name: Configure Git
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

- name: Extract version from branch name
id: version
run: |
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT

if [[ $BRANCH_NAME == release/v* ]]; then
VERSION=$(echo $BRANCH_NAME | sed 's/release\/v//')
TYPE="release"
elif [[ $BRANCH_NAME == hotfix/v* ]]; then
VERSION=$(echo $BRANCH_NAME | sed 's/hotfix\/v//')
TYPE="hotfix"
fi

echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "type=$TYPE" >> $GITHUB_OUTPUT

- name: Check if develop branch exists
id: check_develop
run: |
if git ls-remote --heads origin develop | grep -q develop; then
echo "exists=true" >> $GITHUB_OUTPUT
else
echo "exists=false" >> $GITHUB_OUTPUT
echo "⚠️ Develop branch does not exist. Skipping backmerge."
fi

- name: Create backmerge pull request
if: steps.check_develop.outputs.exists == 'true'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
# Create a unique branch name for the backmerge
BACKMERGE_BRANCH="backmerge/main-to-develop-$(date +%Y%m%d-%H%M%S)"

# Fetch and checkout develop
git fetch origin develop:develop

# Create new branch from develop
git checkout -b $BACKMERGE_BRANCH develop

# Merge main into the backmerge branch
echo "Attempting to merge main into $BACKMERGE_BRANCH..."

# Try to merge main
if git merge origin/main --no-edit; then
echo "βœ… Merge successful, no conflicts"

# Push the backmerge branch
git push origin $BACKMERGE_BRANCH

# Create PR using GitHub CLI
PR_TITLE="chore: backmerge v${{ steps.version.outputs.version }} to develop"

cat > pr_body.md << 'PREOF'
## Automated Backmerge

This PR automatically backmerges changes from `main` to `develop` branch.

### Source
- **Original PR:** #${{ github.event.pull_request.number }}
- **Title:** ${{ github.event.pull_request.title }}
- **Merged by:** @${{ github.event.pull_request.merged_by.login }}
- **Merged at:** ${{ github.event.pull_request.merged_at }}

### Branch Information
- **Source branch:** `${{ github.event.pull_request.head.ref }}`
- **Type:** ${{ github.event.pull_request.head.ref }}

### Actions Required
- πŸ‘€ **Review Required** - This PR needs approval before merging
- βœ… Ensure all CI/CD checks pass
- βœ… Review changes for any conflicts or issues
- βœ… Merge after approval

---
*This PR was automatically created by GitHub Actions workflow.*
PREOF

# Create PR with review requirements
# Uncomment --draft if you want PRs to be created as draft
# Add --reviewer "username1,username2" to auto-assign reviewers
gh pr create \
--base develop \
--head $BACKMERGE_BRANCH \
--title "$PR_TITLE" \
--body-file pr_body.md \
--label "chore,auto-generated" \
--no-maintainer-edit

echo "βœ… Pull request created successfully"

else
echo "❌ Merge conflicts detected"

# Reset merge
git merge --abort

# Push the branch anyway for manual resolution
git push origin $BACKMERGE_BRANCH

# Create PR with conflict warning
PR_TITLE="chore: backmerge v${{ steps.version.outputs.version }} to develop (conflicts)"

cat > pr_conflict_body.md << 'PREOF'
## ⚠️ Automated Backmerge with Conflicts

This PR attempts to backmerge changes from `main` to `develop` branch, but **conflicts were detected**.

### Source
- **Original PR:** #${{ github.event.pull_request.number }}
- **Title:** ${{ github.event.pull_request.title }}
- **Merged by:** @${{ github.event.pull_request.merged_by.login }}
- **Merged at:** ${{ github.event.pull_request.merged_at }}

### Branch Information
- **Source branch:** `${{ github.event.pull_request.head.ref }}`
- **Type:** ${{ github.event.pull_request.head.ref }}

### ⚠️ Manual Actions Required
1. Checkout the branch locally
2. Merge `main` and resolve conflicts manually
3. Push the resolved changes
4. Request review and merge this PR

```bash
git fetch origin
git checkout -b ${BACKMERGE_BRANCH} origin/${BACKMERGE_BRANCH}
git merge origin/main
# Resolve conflicts in your editor
git add .
git commit
git push origin ${BACKMERGE_BRANCH}
```

---
*This PR was automatically created by GitHub Actions workflow. Manual conflict resolution is required.*
PREOF

gh pr create \
--base develop \
--head $BACKMERGE_BRANCH \
--title "$PR_TITLE" \
--body-file pr_conflict_body.md \
--label "chore,auto-generated,has-conflicts" \
--no-maintainer-edit

echo "⚠️ Pull request created with conflict warning"

# Exit with error to mark the job as failed
exit 1
fi

- name: Summary
if: always()
run: |
echo "## Backmerge Summary" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "- **Source PR:** #${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY
echo "- **Source Branch:** \`${{ github.event.pull_request.head.ref }}\`" >> $GITHUB_STEP_SUMMARY
echo "- **Target Branch:** \`develop\`" >> $GITHUB_STEP_SUMMARY
echo "- **Triggered by:** @${{ github.event.pull_request.merged_by.login }}" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY

if [ "${{ steps.check_develop.outputs.exists }}" == "false" ]; then
echo "⚠️ **Status:** Skipped - develop branch does not exist" >> $GITHUB_STEP_SUMMARY
else
echo "βœ… **Status:** Backmerge PR created" >> $GITHUB_STEP_SUMMARY
fi
Loading
Loading