Merge branch 'main' into manually_trigger_tests

Author: perazz

.github/workflows/fpm-version-update.yml

@@ -35,8 +35,8 @@ jobs:
       - name: Compare versions
         id: check-update
         run: |
-          if [ "${LATEST_VERSION}" != "${CURRENT_VERSION}" ] || [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then
-            echo "New version available!"
+          if [ "${{ env.LATEST_VERSION }}" != "${{ env.CURRENT_VERSION }}" ] || [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "New version available or manually triggered!"
             echo "UPDATE_NEEDED=true" >> "$GITHUB_ENV"
           else
             echo "UPDATE_NEEDED=false" >> "$GITHUB_ENV"
@@ -47,52 +47,46 @@ jobs:
         if: env.UPDATE_NEEDED == 'true'
         id: get-sha256
         run: |
-          SHA_URL="https://github.com/fortran-lang/fpm/releases/download/${LATEST_VERSION_V}/fpm-${LATEST_VERSION}.zip.sha256"
+          SHA_URL="https://github.com/fortran-lang/fpm/releases/download/${{ env.LATEST_VERSION_V }}/fpm-${{ env.LATEST_VERSION }}.zip.sha256"
           SHA256="$(curl -sL "${SHA_URL}" | awk '{print $1}')"
           echo "SHA256=${SHA256}" >> "$GITHUB_ENV"
           echo "New SHA256: ${SHA256}"
 
       - name: Create branch for update
         if: env.UPDATE_NEEDED == 'true'
         run: |
-          BRANCH_NAME="auto-update-fpm-${LATEST_VERSION}"
-          git checkout -b "${BRANCH_NAME}"
+          BRANCH_NAME="auto-update-fpm-${{ env.LATEST_VERSION }}-$(date +%s)"  # Add timestamp to branch name for uniqueness
           echo "BRANCH_NAME=${BRANCH_NAME}" >> "$GITHUB_ENV"
 
       - name: Update formula
         if: env.UPDATE_NEEDED == 'true'
         run: |
-          sed -i "1i # Formula last updated on $(date)" Formula/fpm.rb
-          sed -i "s|url \".*\"|url \"https://github.com/fortran-lang/fpm/releases/download/${LATEST_VERSION_V}/fpm-${LATEST_VERSION}.zip\"|" Formula/fpm.rb
-          sed -i "s|sha256 \".*\"|sha256 \"${SHA256}\"|" Formula/fpm.rb
-
-      - name: Commit changes
-        if: env.UPDATE_NEEDED == 'true'
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "[email protected]"
-          git add Formula/fpm.rb
-          git commit -m "Update fpm to ${LATEST_VERSION}"
-
-      - name: Push changes to branch
+          TIMESTAMP=$(date +%s)
+          RUN_ID="${{ github.run_id }}-${{ github.run_number }}"
+          sed -i "1s/^/# Formula last updated on $(date -u +"%Y-%m-%dT%H:%M:%SZ") (Run: ${RUN_ID})\n/" Formula/fpm.rb
+          sed -i "s|url \".*\"|url \"https://github.com/fortran-lang/fpm/releases/download/${{ env.LATEST_VERSION_V }}/fpm-${{ env.LATEST_VERSION }}.zip\"|" Formula/fpm.rb
+          sed -i "s|sha256 \".*\"|sha256 \"${{ env.SHA256 }}\"|" Formula/fpm.rb
+          
+      - name: Debug - Show changes
         if: env.UPDATE_NEEDED == 'true'
         run: |
-          git push origin "${BRANCH_NAME}"
+          git diff Formula/fpm.rb || echo "No changes detected in Formula/fpm.rb"
 
       - name: Create Pull Request
         if: env.UPDATE_NEEDED == 'true'
         id: create-pr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update fpm to ${{ env.LATEST_VERSION }}"
+          commit-message: "Update fpm to ${{ env.LATEST_VERSION }} with timestamp"
           title: "Update fpm to ${{ env.LATEST_VERSION }}"
           body: |
             This PR automatically updates the fpm formula to version ${{ env.LATEST_VERSION }}.
             
             **Changes:**
             - Updated URL to ${{ env.LATEST_VERSION_V }} release
             - Updated SHA256 to match the new release
+            - Added timestamp to force PR: $(date -u +"%Y-%m-%dT%H:%M:%SZ")
             
             This PR was created automatically by GitHub Actions.
           branch: ${{ env.BRANCH_NAME }}
@@ -121,15 +115,13 @@ jobs:
       - name: Wait for test-bot to complete
         if: env.UPDATE_NEEDED == 'true' && steps.create-pr.outputs.pull-request-number
         run: |
-          # Wait for CI to start and finish (maximum 30 minutes)
           echo "Waiting for test-bot workflow to complete..."
           PR_NUMBER=${{ steps.create-pr.outputs.pull-request-number }}
           timeout=1800  # 30 minutes in seconds
           interval=60   # Check every minute
           elapsed=0
           
           while [ $elapsed -lt $timeout ]; do
-            # Check if test-bot workflow has completed
             STATUS=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
               "https://api.github.com/repos/${{ github.repository }}/actions/runs?status=completed&event=pull_request&head_sha=$(git rev-parse HEAD)")
             
@@ -156,7 +148,6 @@ jobs:
             exit 1
           fi
 
-      # Add label to trigger pr-pull workflow
       - name: Add pr-pull label
         if: env.UPDATE_NEEDED == 'true' && steps.create-pr.outputs.pull-request-number
         uses: actions/github-script@v6

Formula/fpm.rb

@@ -1,3 +1,5 @@
+# Formula last updated on 2025-03-10
+
 class Fpm < Formula
   desc "Fortran Package Manager (fpm)"
   homepage "https://fpm.fortran-lang.org"