test

.github/workflows/automerge-dependabot-prs-into-collected-branch.yml

@@ -1,38 +1,77 @@
-# This script seperate major and minor but we do merge them into the same branch. 
-# Having two steps allows us to easily turn off major changes in future and then script them to their own branch and pipeline.
-name: Auto-merge Dependabot PRs
+# qqqq in development
+# this script seperate major and minor but we do merge them into the same branch. 
+# having two steps allows us to easily turn off major changes in future and then script them to their own branch and pipeline.
+name: auto-merge dependabot prs into collected branch
 on:
   pull_request:
-    types: [opened, synchronize]
-    branches: [Automatic_version_update_dependabot]  # Make sure this matches your actual branch name
+    # types: [opened, synchronize]
+    branches: [Automatic_version_update_dependabot]
 
+
 permissions:
   contents: write
   pull-requests: write
+  checks: read
+  issues: write
 
 jobs:
+  debug:
+    runs-on: ubuntu-latest
+    steps:
+      - name: debug info
+        run: |
+          echo "actor: ${{ github.actor }}"
+          echo "pr title: ${{ github.event.pull_request.title }}"
+          echo "github event_name: ${{ github.event_name }}"
+          echo "target branch: ${{ github.event.pull_request.base.ref }}"
+          echo "source branch: ${{ github.event.pull_request.head.ref }}"
+          echo "PR Number: ${{ github.event.pull_request.number }}"
+          echo "event type: ${{ github.event.pull_request.type || 'N/A' }}"
+          echo "Pull request user login: ${{ github.event.pull_request.user.login }}"
+          echo "Repository: ${{ github.repository }}"
+          echo "Event name: ${{ github.event_name }}"
+          echo "Event action: ${{ github.event.action }}"
+
+  # Branch rules ensure doesnt auto merge if shouldnt       
   auto-merge:
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
+    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'TechnologyEnhancedLearning/TELBlazor' }}
     steps:
-      - name: Extract update type
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Set up GitHub CLI
+        run: |
+          # Install GitHub CLI (gh)
+          sudo apt-get update
+          sudo apt-get install gh
+
+      - name: extract update type
         id: extract
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          PR_TITLE="${{ github.event.pull_request.title }}"
-          if [[ $PR_TITLE == *"(major)"* ]]; then
+          echo "get pr title"
+          pr_title="${{ github.event.pull_request.title }}"
+          echo "PR title: $pr_title"
+          if [[ "$pr_title" == *"(major)"* ]]; then
             echo "update_type=major" >> $GITHUB_OUTPUT
+            echo "Detected major update"
           else
             echo "update_type=minor_or_patch" >> $GITHUB_OUTPUT
+            echo "Detected minor or patch update"
           fi
 
-      - name: Auto-merge minor and patch updates
+      - name: auto-merge minor and patch updates
         if: steps.extract.outputs.update_type == 'minor_or_patch'
-        run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
+        run: |
+          gh pr merge --auto --merge "${{ github.event.pull_request.number }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Auto-merge major updates
+      - name: auto-merge major updates
         if: steps.extract.outputs.update_type == 'major'
-        run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
+        run: |
+          gh pr merge --auto --merge "${{ github.event.pull_request.number }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge-dependabot-prs-into-collected-branch.yml-works-defunct

@@ -0,0 +1,99 @@
+# qqqq this does add auto merge but seems to trigger on the first set of checks git guardian (it seems), 
+# also it calls for checks not specifically for out branch
+# so an approach based one the branch is likely better
+name: auto-merge dependabot prs into collected branch
+on:
+  # pull_request:
+  # synchronize
+    # types: [opened, synchronize]
+    # branches: [Automatic_version_update_dependabot]  # make sure this matches your actual branch name
+  check_suite:
+    types: [completed]    
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  checks: read
+
+jobs:
+  debug:
+    runs-on: ubuntu-latest
+    steps:
+      - name: debug info
+        run: |
+          echo "actor: ${{ github.actor }}"
+          echo "pr title: ${{ github.event.pull_request.title }}"
+          echo "github event_name: ${{ github.event_name }}"
+          echo "github event_suite conlusion: ${{ github.event.check_suite.conclusion }}"
+          echo "target branch: ${{ github.event.pull_request.base.ref }}"
+          echo "source branch: ${{ github.event.pull_request.head.ref }}"
+          echo "Check Suite ID: ${{ github.event.check_suite.id }}"
+          echo "Conclusion: ${{ github.event.check_suite.conclusion }}"
+          echo "Target Branch: ${{ github.event.check_suite.pull_requests[0].base.ref }}"
+          echo "PR Number: ${{ github.event.check_suite.pull_requests[0].number }}"
+
+      - name: Dump event payload
+        run: |
+          echo "==== EVENT NAME ===="
+          echo "${{ github.event_name }}"
+          echo "==== RAW CHECK_SUITE PAYLOAD ===="
+          echo '${{ toJson(github.event.check_suite) }}'
+          echo "==== PRs in this check suite ===="
+          echo '${{ toJson(github.event.check_suite.pull_requests) }}'
+
+
+  auto-merge:
+    runs-on: ubuntu-latest
+    # if: github.event.check_suite.pull_requests[0].base.ref == 'main'
+    # if dependabot and checks ran
+    # if: (github.event_name != 'check_suite' || github.event.check_suite.conclusion == 'success')
+    # qqqq put back in later if: (github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch')&& (github.event_name != 'check_suite' || github.event.check_suite.conclusion == 'success')
+
+
+    # qqqq add in after testing && github.actor == 'dependabot[bot]'
+    if:  github.event.check_suite.conclusion == 'success' && github.event.check_suite.pull_requests[0].base.ref == 'Automatic_version_update_dependabot'
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v3
+
+      - name: Set up GitHub CLI
+        run: |
+          # Install GitHub CLI (gh)
+          sudo apt-get update
+          sudo apt-get install gh
+
+      - name: extract update type
+        id: extract
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "get pr number"
+          pr_number=${{ github.event.check_suite.pull_requests[0].number }}
+          echo "PR title: $pr_number"
+          # pr_title="${{ github.event.pull_request.title }}"
+          pr_title=$(gh pr view "$pr_number" --json title --jq .title)
+          echo "PR title: $pr_title"
+          if [[ $pr_title == *"(major)"* ]]; then
+            echo "update_type=major" >> $GITHUB_OUTPUT
+          else
+            echo "update_type=minor_or_patch" >> $GITHUB_OUTPUT
+          fi
+
+      - name: auto-merge minor and patch updates
+        if: steps.extract.outputs.update_type == 'minor_or_patch'
+        # auto should set the the request to merge once checks complete
+        # qqqq could squash for cleaner? --squash "${{ github.event.pull_request.html_url }}"
+        # run: gh pr merge --auto 1
+        run: gh pr merge --auto --merge ${{ github.event.check_suite.pull_requests[0].number }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: auto-merge major updates
+        if: steps.extract.outputs.update_type == 'major'
+        # auto should set the the request to merge once checks complete
+        # qqqq could squash for cleaner? --squash "${{ github.event.pull_request.html_url }}"
+        # run: gh pr merge --auto 1
+        run: gh pr merge --auto --merge ${{ github.event.check_suite.pull_requests[0].number }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/collected-dependabot-staging-to-master.yml-disabled

@@ -0,0 +1,49 @@
+# qqqq in development
+name: Collected Dependabot Promotion From Staging To Master
+on:
+  schedule:
+    # we want the opposite weeks to staging so we get a week where it occurs in manual testing
+    - cron: '0 9 8-14 * 1'  # Second Monday of month
+    - cron: '0 9 22-28 * 1' # Fourth Monday of month
+  workflow_dispatch:
+
+jobs:
+  promote-to-master:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for changes
+        id: changes
+        run: |
+          git fetch origin Automatic_collected_dependabot_staging:Automatic_collected_dependabot_staging
+          git fetch origin master:master
+
+          if git diff --quiet master Automatic_collected_dependabot_staging; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          else
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create PR to master
+        if: steps.changes.outputs.has_changes == 'true'
+        run: |
+          if gh pr list --head Automatic_collected_dependabot_staging --base master --json number --jq '.[0].number' | grep -q .; then
+            echo "PR already exists, skipping creation"
+          else
+            gh pr create \
+              --base master \
+              --head Automatic_collected_dependabot_staging \
+              --title "Fortnightly dependabot collected master promotion - $(date +%Y-%m-%d)" \
+              --body "Automated weekly promotion from staging to master after testing period" \
+              --auto-merge \
+              --merge
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/collected-dependabot-to-staging.yml-disabled

@@ -0,0 +1,47 @@
+# qqqq in development
+
+name: Dependabot Collected Promotion To Staging
+# this logic will require branch ruleset checks of running the dev pipeline
+on:
+  schedule:
+    # Promotion from staging to release should be a week apart so alternating weeks (also live updates dangerous)
+    - cron: '0 9 1-7 * 1'   # First Monday of month
+    - cron: '0 9 15-21 * 1' # Third Monday of month
+  workflow_dispatch:  # Allow manual trigger
+
+jobs:
+  promote-to-automatic-collected-dependabot-staging:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for changes
+        id: changes
+        run: |
+          git fetch origin Automatic_version_update_dependabot:Automatic_version_update_dependabot
+          git fetch origin Automatic_collected_dependabot_staging:Automatic_collected_dependabot_staging
+
+          if git diff --quiet Automatic_collected_dependabot_staging Automatic_version_update_dependabot; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          else
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create PR to Automatic_collected_dependabot_staging
+        if: steps.changes.outputs.has_changes == 'true'
+        run: |
+          gh pr create \
+            --base Automatic_collected_dependabot_staging \
+            --head Automatic_version_update_dependabot \
+            --title "Fortnightly dependabot collected to staging - $(date +%Y-%m-%d)" \
+            --body "Automated Fortnightly promotion of dependency updates from dependabot" \
+            --auto-merge \
+            --merge
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dev.yml

@@ -50,10 +50,10 @@ jobs:
       TEL_GIT_PACKAGES_TOKEN: ${{secrets.NUGETKEY }}
 
       # Prod
-      UNITTESTS_APPSETTINGS_PRODUCTION: ${{ secrets.UNITTESTS_APPSETTINGS_PRODUCTION }}
-      WASMSTATICCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSTATICCLIENT_APPSETTINGS_PRODUCTION }}
-      WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION }}
-      WASMSERVERHOST_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOST_APPSETTINGS_PRODUCTION }}
+      # UNITTESTS_APPSETTINGS_PRODUCTION: ${{ secrets.UNITTESTS_APPSETTINGS_PRODUCTION }}
+      # WASMSTATICCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSTATICCLIENT_APPSETTINGS_PRODUCTION }}
+      # WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION }}
+      # WASMSERVERHOST_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOST_APPSETTINGS_PRODUCTION }}
 
   # Now we've done due diligence
   # The checks have been allowed to run if the workflow fails so if there a multiple fails we know. 
@@ -92,10 +92,35 @@ jobs:
       - name: Run dev semantic version (None Blocking)
         id: detect_semantic_version
         run: |
+          echo "error catch run of semver first to get any error detail on config issues"
+          set +e
+          SEMVER_OUTPUT_RAW_ERROR_CHECK=$(npx semantic-release --dry-run 2> /tmp/semantic-release-errors.log)
+          STATUS_ERROR_CHECK=$?
+
+          # Now you can check the status and log the error messages if an error occurred
+          if [ $STATUS_ERROR_CHECK -ne 0 ]; then
+            echo "❌ Semantic release failed with exit code $STATUS_ERROR_CHECK."
+            echo "❌ Error output:"
+            cat /tmp/semantic-release-errors.log
+          else
+            echo "✅ Semantic Ouput success : $SEMVER_OUTPUT_RAW_ERROR_CHECK "
+            echo "✅ Error on success : $STATUS_ERROR_CHECK"
+          fi
+
+          set -e
+
 
           echo "running semantic-release"
-          SEMVER_OUTPUT_RAW=$(npx semantic-release --dry-run 2>&1)
-          STATUS=$?
+          semver_output_raw=$(npx semantic-release --dry-run 2>&1)
+          status=$?
+
+          # Now you can check the status and log the error messages if an error occurred
+          if [ $STATUS -ne 0 ]; then
+            echo "Semantic release failed with exit code $STATUS."
+            echo "Error output:"
+            cat /tmp/semantic-release-errors.log
+          fi
+
           echo "status = $STATUS"
           echo "$SEMVER_OUTPUT_RAW"          
 
@@ -361,5 +386,4 @@ jobs:
             -H "Authorization: Bearer $TEL_GIT_PACKAGES_TOKEN" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             https://api.github.com/repos/$repo_owner/$repo_name/dispatches \
-            -d "{\"event_type\": \"$event_type\", \"client_payload\": {\"artifact_url\": \"$artifact_url\"}}"      
-
+            -d "{\"event_type\": \"$event_type\", \"client_payload\": {\"artifact_url\": \"$artifact_url\"}}"      

.github/workflows/pull_request.yml

@@ -23,9 +23,4 @@ jobs:
       WASMSTATICCLIENT_APPSETTINGS_DEVELOPMENT: ${{ secrets.WASMSTATICCLIENT_APPSETTINGS_DEVELOPMENT }}
       WASMSERVERHOSTCLIENT_APPSETTINGS_DEVELOPMENT: ${{ secrets.WASMSERVERHOSTCLIENT_APPSETTINGS_DEVELOPMENT }}
       WASMSERVERHOST_APPSETTINGS_DEVELOPMENT: ${{ secrets.WASMSERVERHOST_APPSETTINGS_DEVELOPMENT }}
-      TEL_GIT_PACKAGES_TOKEN: ${{secrets.NUGETKEY }}
-
-      UNITTESTS_APPSETTINGS_PRODUCTION: ${{ secrets.UNITTESTS_APPSETTINGS_PRODUCTION }}
-      WASMSTATICCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSTATICCLIENT_APPSETTINGS_PRODUCTION }}
-      WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION }}
-      WASMSERVERHOST_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOST_APPSETTINGS_PRODUCTION }}
+      TEL_GIT_PACKAGES_TOKEN: ${{secrets.NUGETKEY }}