Merge master into main

.github/workflows/prepare-release-pr.yml

@@ -1,34 +1,49 @@
-name: Prepare Release PR
+name: Create PR from master to main
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master
 
-# Add this permissions block
-permissions:
-  contents: write
-  pull-requests: write
-
 jobs:
-  create_release_pr:
+  create-pull-request:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          # Add this line to use the token for authentication
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout -b release-main
-          git push origin release-main --force
-      - uses: peter-evans/create-pull-request@v5
-        with:
-          base: main
-          title: "Automated Release PR: release-main -> main"
-          body: "Automated release changes."
-          branch: release-main
-          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: master
+
+      - name: Set Git Identity
+        run: |
+          git config --global user.name 'GitHub Actions'
+          git config --global user.email 'github-actions@github.com'
+
+      - name: Create Pull Request with gh cli
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # We're already on master, just need to fetch main
+          git fetch origin main:refs/remotes/origin/main
+
+          # Check if there are differences between main and master
+          DIFF_COUNT=$(git rev-list --count origin/main..HEAD)
+
+          if [ "$DIFF_COUNT" -gt 0 ]; then
+            echo "Differences found between main and master. Creating PR..."
+
+            # Use GitHub CLI to create the PR
+            gh pr create \
+              --base main \
+              --head master \
+              --title "Merge master into main" \
+              --body "This is an automated PR to merge changes from master into main branch." || true
+
+            echo "Pull request created or already exists."
+          else
+            echo "No differences found between main and master. Skipping PR creation."
+          fi

readme.md

@@ -1,6 +1,6 @@
 <h1 align="center">python-fm-dapi-weaver</h1><br>
 
-A Developer-Friendly Python library for interacting with FileMaker Server via the FileMaker Data API. Connect your apps to FileMaker databases for streamlined data management, automation, and integration
+A developer-friendly Python library for interacting with FileMaker Server via the FileMaker Data API. Connect your apps to FileMaker databases for streamlined data management, automation, and integration
 
 ## Table of Contents