Enhance release logic to support manual triggers and increment WSL version accordingly

Author: FloSch62

.github/workflows/build-wsl-image.yml

@@ -60,15 +60,34 @@ jobs:
         run: |
           NEED_RELEASE="false"
           NEW_WSL_VERSION="1.0"
-
+          
+          # Always build when manually triggered
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            NEED_RELEASE="true"
+            echo "Manual trigger detected - forcing release"
           # Check if containerlab version is different
-          if [[ "${{ steps.current_release.outputs.CURRENT_CONTAINERLAB_VERSION }}" != "${{ steps.containerlab.outputs.CONTAINERLAB_VERSION }}" ]]; then
+          elif [[ "${{ steps.current_release.outputs.CURRENT_CONTAINERLAB_VERSION }}" != "${{ steps.containerlab.outputs.CONTAINERLAB_VERSION }}" ]]; then
             NEED_RELEASE="true"
           elif [[ "${{ steps.current_release.outputs.CURRENT_CONTAINERLAB_VERSION }}" == "none" ]]; then
             # No previous releases
             NEED_RELEASE="true"
           fi
 
+          # For manual triggers with no version change, use current containerlab version with bumped WSL version
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" && "${{ steps.current_release.outputs.CURRENT_CONTAINERLAB_VERSION }}" == "${{ steps.containerlab.outputs.CONTAINERLAB_VERSION }}" ]]; then
+            # Increment the WSL version
+            if [[ "${{ steps.current_release.outputs.CURRENT_WSL_VERSION }}" != "none" ]]; then
+              CURRENT_WSL_VERSION="${{ steps.current_release.outputs.CURRENT_WSL_VERSION }}"
+              # Extract major and minor version parts
+              WSL_MAJOR=$(echo $CURRENT_WSL_VERSION | cut -d'.' -f1)
+              WSL_MINOR=$(echo $CURRENT_WSL_VERSION | cut -d'.' -f2)
+              # Increment minor version
+              NEW_WSL_MINOR=$((WSL_MINOR + 1))
+              NEW_WSL_VERSION="$WSL_MAJOR.$NEW_WSL_MINOR"
+            fi
+            echo "Using existing containerlab version with incremented WSL version: $NEW_WSL_VERSION"
+          fi
+
           # Set output variables
           echo "NEED_RELEASE=$NEED_RELEASE" >> $GITHUB_OUTPUT
           echo "NEW_TAG=${{ steps.containerlab.outputs.CONTAINERLAB_VERSION }}-$NEW_WSL_VERSION" >> $GITHUB_OUTPUT
@@ -93,13 +112,16 @@ jobs:
         with:
           tag_name: ${{ steps.release.outputs.NEW_TAG }}
           name: "Release ${{ steps.release.outputs.NEW_TAG }}"
-          body: "WSL2 image for containerlab version ${{ steps.containerlab.outputs.CONTAINERLAB_VERSION }}\n\nThis release was automatically generated based on the latest containerlab release."
+          body: |
+            WSL2 image for containerlab version ${{ steps.containerlab.outputs.CONTAINERLAB_VERSION }}
+            
+            ${{ github.event_name == 'workflow_dispatch' && 'This release was manually triggered.' || 'This release was automatically generated based on the latest containerlab release.' }}
           draft: false
           prerelease: false
 
   build-and-publish:
     runs-on: ubuntu-22.04
-    # Run this job if triggered by a release event or if the check-and-release job completed successfully
+    # Run this job if triggered by a release event or if the check-and-release job determined a release is needed
     # The needs clause is conditional to avoid dependency on a job that might be skipped
     needs: [check-and-release]
     if: >