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 [![GitHub](https://img.shields.io/badge/--181717?logo=github&logoColor=ffffff)](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 image +
-

Total Visitors

- Visitor Count + Total views +

Refresh Date: 2025-07-17

+ diff --git a/1_MS365/Excel/README.md b/1_MS365/Excel/README.md index 440bcee53..4b982d5a7 100644 --- a/1_MS365/Excel/README.md +++ b/1_MS365/Excel/README.md @@ -30,7 +30,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/1_MS365/Forms/README.md b/1_MS365/Forms/README.md index d6dbae1f4..5efa057b2 100644 --- a/1_MS365/Forms/README.md +++ b/1_MS365/Forms/README.md @@ -29,7 +29,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/1_MS365/Planner/README.md b/1_MS365/Planner/README.md index 67028ac22..5cb0bf0df 100644 --- a/1_MS365/Planner/README.md +++ b/1_MS365/Planner/README.md @@ -31,7 +31,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/1_MS365/README.md b/1_MS365/README.md index 109f106d6..10d071e48 100644 --- a/1_MS365/README.md +++ b/1_MS365/README.md @@ -51,7 +51,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/1_MS365/SharePoint/README.md b/1_MS365/SharePoint/README.md index 82b2f1bdb..e06340498 100644 --- a/1_MS365/SharePoint/README.md +++ b/1_MS365/SharePoint/README.md @@ -33,8 +33,8 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/2_Dynamics365/README.md b/2_Dynamics365/README.md index 2f7d8fb5e..0f0eadf73 100644 --- a/2_Dynamics365/README.md +++ b/2_Dynamics365/README.md @@ -31,7 +31,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

\ No newline at end of file diff --git a/3_PowerPlatform/0_PowerApps/README.md b/3_PowerPlatform/0_PowerApps/README.md index abfd64c01..de300483e 100644 --- a/3_PowerPlatform/0_PowerApps/README.md +++ b/3_PowerPlatform/0_PowerApps/README.md @@ -38,7 +38,7 @@ formatDateTime(utcNow(), 'MM-dd-yyyy')
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

\ No newline at end of file diff --git a/3_PowerPlatform/1_PowerBI/README.md b/3_PowerPlatform/1_PowerBI/README.md index 8eacc98ec..0eb81fe31 100644 --- a/3_PowerPlatform/1_PowerBI/README.md +++ b/3_PowerPlatform/1_PowerBI/README.md @@ -49,7 +49,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/3_PowerPlatform/2_CopilotStudio/0_DesignCustomCopilots.md b/3_PowerPlatform/2_CopilotStudio/0_DesignCustomCopilots.md index 576b544a5..fea10a690 100644 --- a/3_PowerPlatform/2_CopilotStudio/0_DesignCustomCopilots.md +++ b/3_PowerPlatform/2_CopilotStudio/0_DesignCustomCopilots.md @@ -343,7 +343,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/3_PowerPlatform/README.md b/3_PowerPlatform/README.md index c6ceb69d3..cd53cd546 100644 --- a/3_PowerPlatform/README.md +++ b/3_PowerPlatform/README.md @@ -42,7 +42,7 @@ Explore more on the [Microsoft Power Platform website](https://www.microsoft.com
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/README.md b/README.md index d27ea2dd6..fd3ba373e 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Last updated: 2025-07-17
- Total views -

Refresh Date: 2025-07-16

+ Total views +

Refresh Date: 2025-07-17

diff --git a/metrics.json b/metrics.json new file mode 100644 index 000000000..86655415d --- /dev/null +++ b/metrics.json @@ -0,0 +1,37 @@ +[ + { + "date": "2025-07-07", + "count": 330, + "uniques": 20 + }, + { + "date": "2025-07-08", + "count": 159, + "uniques": 6 + }, + { + "date": "2025-07-10", + "count": 482, + "uniques": 1 + }, + { + "date": "2025-07-11", + "count": 170, + "uniques": 4 + }, + { + "date": "2025-07-12", + "count": 7, + "uniques": 1 + }, + { + "date": "2025-07-14", + "count": 130, + "uniques": 2 + }, + { + "date": "2025-07-15", + "count": 2, + "uniques": 1 + } +] \ No newline at end of file