diff --git a/.github/workflows/update-md-date.yml b/.github/workflows/update-md-date.yml
index ac7a96d4b..5b2a19b9a 100644
--- a/.github/workflows/update-md-date.yml
+++ b/.github/workflows/update-md-date.yml
@@ -14,10 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- - name: Checkout repository
+ - name: Checkout PR branch
uses: actions/checkout@v4
with:
fetch-depth: 0
+ ref: ${{ github.event.pull_request.head.ref }}
- name: Set up Python
uses: actions/setup-python@v4
@@ -35,13 +36,13 @@ jobs:
- name: Update last modified date in Markdown files
run: python .github/workflows/update_date.py
- - name: Commit changes
+ - name: Pull (merge) remote changes, commit, and push if needed
env:
TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
- git fetch origin ${{ github.event.pull_request.head.ref }}
- git pull --rebase origin ${{ github.event.pull_request.head.ref }} || echo "No rebase needed"
+ BRANCH="${{ github.event.pull_request.head.ref }}"
+ git pull origin "$BRANCH" || echo "No merge needed"
git add -A
git commit -m "Update last modified date in Markdown files" || echo "No changes to commit"
git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
- git push origin HEAD:${{ github.event.pull_request.head.ref }}
+ git push origin HEAD:"$BRANCH"
diff --git a/.github/workflows/use-visitor-counter.yml b/.github/workflows/use-visitor-counter.yml
index d5c9ec139..90c4b1f85 100644
--- a/.github/workflows/use-visitor-counter.yml
+++ b/.github/workflows/use-visitor-counter.yml
@@ -57,7 +57,7 @@ jobs:
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
- # Commit and push logic for PR events
+ # Commit and push logic for PR events (merge, not rebase)
- name: Commit and push changes (PR)
if: github.event_name == 'pull_request'
env:
@@ -65,13 +65,14 @@ jobs:
run: |
git fetch origin
git checkout ${{ github.head_ref }}
- git add "*.md" metrics.json
+ git pull origin ${{ github.head_ref }} || echo "No merge needed"
+ git add "*.md" || true
+ [ -f metrics.json ] && git add metrics.json || true
git commit -m "Update visitor count" || echo "No changes to commit"
git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
- git pull --rebase origin ${{ github.head_ref }} || echo "No rebase needed"
git push origin HEAD:${{ github.head_ref }}
- # Commit and push logic for non-PR events (schedule, workflow_dispatch)
+ # Commit and push logic for non-PR events (merge, not rebase)
- name: Commit and push changes (non-PR)
if: github.event_name != 'pull_request'
env:
@@ -79,18 +80,9 @@ jobs:
run: |
git fetch origin
git checkout ${{ github.ref_name }} || git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }}
- git add "*.md" metrics.json
+ git pull origin ${{ github.ref_name }} || echo "No merge needed"
+ git add "*.md" || true
+ [ -f metrics.json ] && git add metrics.json || true
git commit -m "Update visitor count" || echo "No changes to commit"
git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
- git pull --rebase origin ${{ github.ref_name }} || echo "No rebase needed"
git push origin HEAD:${{ github.ref_name }}
-
- - name: Create Pull Request (non-PR)
- if: github.event_name != 'pull_request'
- uses: peter-evans/create-pull-request@v6
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- branch: update-visitor-count
- title: "Update visitor count"
- body: "Automated update of visitor count"
- base: main
diff --git a/0_Azure/README.md b/0_Azure/README.md
index a0278dc8e..7797308f9 100644
--- a/0_Azure/README.md
+++ b/0_Azure/README.md
@@ -5,7 +5,7 @@ Costa Rica
[](https://github.com/)
[brown9804](https://github.com/brown9804)
-Last updated: 2025-04-08
+Last updated: 2025-07-17
------------------------------------------
@@ -126,7 +126,9 @@ Last updated: 2025-04-08
+
Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17
Refresh Date: 2025-07-16
+Refresh Date: 2025-07-17