Merge branch 'main' into add_history

Author: paulbartell

.github/workflows/auto-release.yml

@@ -8,9 +8,13 @@ on:
         required: true
         default: 'HEAD'
       version_number:
-        description: 'Version Number (Ex. 10.4.0)'
+        description: 'Version Number (Ex. 10.4.4)'
         required: true
-        default: '10.4.0'             
+        default: '10.4.4'
+      main_br_version:
+        description: "Version String for task.h on main branch (leave empty to leave as-is)."
+        require: false
+        default: ''
 
 jobs:
   release-packager:
@@ -32,11 +36,11 @@ jobs:
         with:
           repository: FreeRTOS/FreeRTOS
           path: tools
-      
-      # Simpler git auth if we use checkout action and forward the repo to release script 
+
+      # Simpler git auth if we use checkout action and forward the repo to release script
       - name: Checkout FreeRTOS Kernel
         uses: actions/checkout@v2
-        with: 
+        with:
           path: local_kernel
           fetch-depth: 0
 
@@ -45,10 +49,9 @@ jobs:
           # Configure repo for push
           git config --global user.name ${{ github.actor }}
           git config --global user.email ${{ github.actor }}@users.noreply.github.com
-          
           # Install deps and run
           pip install -r ./tools/.github/scripts/release-requirements.txt
-          ./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ github.event.inputs.commit_id }} --new-kernel-version=${{ github.event.inputs.version_number }}
+          ./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ github.event.inputs.commit_id }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
           exit $?
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}