'Mods for WAU' exitcodes

.github/workflows/GitFlow_Make-Release-and-Sync-to-Dev.yml

@@ -128,6 +128,16 @@ jobs:
 
             <picture>![Install counter](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU_InstallCounter?style=flat-square&label=Total%20reported%20installations%20for%20this%20release&color=blue)</picture>
 
+  sync:
+    name: Sync develop with main
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+
       # Step 5: Configure Git for merge back to develop
       - name: Configure Git
         shell: bash

.github/workflows/GitFlow_Nightly-builds.yml

@@ -38,9 +38,9 @@ jobs:
         id: check_prs
         shell: powershell
         run: |
-          # Find the latest tag of any type
-          $LATEST_TAG = git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | Select-Object -First 1
-          Write-Host "Latest tag: $LATEST_TAG"
+          # Get the latest release of any type
+          $LATEST_TAG = git tag -l --sort=-version:refname | Select-Object -First 1
+          Write-Host "Latest release: $LATEST_TAG"
 
           # Get merged PRs since last tag using Git directly
           $MERGED_PRS = git log --merges --grep="Merge pull request" --oneline "$LATEST_TAG..${{ env.BRANCH }}"

README.md

@@ -189,6 +189,10 @@ Read more in the [Policies section](https://github.com/Romanitho/Winget-AutoUpda
 This script executes **if the network is active/any version of Winget is installed/WAU is running as SYSTEM**.<br>
 If **ExitCode** is **1** from `_WAU-mods.ps1` then **Re-run WAU**.
 
+In addition to this legacy handling, a new action-based system is now supported.<br>
+This system lets you define multiple actions and conditions directly in your mod scripts, enabling more advanced automation and control over the WAU process.<br>
+With actions, you can execute different scripts, check results, and control the WAU flow with greater flexibility and improved logging compared to relying solely on **Exit Code**.
+
 Likewise `_WAU-mods-postsys.ps1` can be used to do things at the end of the **SYSTEM context WAU** process before the user run.
 
 ## Custom scripts (Mods feature for Apps)

Sources/Winget-AutoUpdate/Winget-Upgrade.ps1

@@ -210,7 +210,7 @@ if (Test-Network) {
                 #Compare
                 if ((Compare-SemVer -Version1 $WAUCurrentVersion -Version2 $WAUAvailableVersion) -lt 0) {
                     #If new version is available, update it
-                    Write-ToLog "WAU Available version: $WAUAvailableVersion" "Yellow";
+                    Write-ToLog "WAU Available version: $WAUAvailableVersion" "DarkYellow";
                     Update-WAU;
                 }
                 else {
@@ -246,10 +246,10 @@ if (Test-Network) {
                     }
                     if ($NewList) {
                         if ($AlwaysDownloaded) {
-                            Write-ToLog "List downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))" "Yellow"
+                            Write-ToLog "List downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))" "DarkYellow"
                         }
                         else {
-                            Write-ToLog "Newer List downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))" "Yellow"
+                            Write-ToLog "Newer List downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))" "DarkYellow"
                         }
                         $Script:AlwaysDownloaded = $False
                     }
@@ -284,33 +284,26 @@ if (Test-Network) {
                     $Script:ReachNoPath = $False
                 }
                 if ($NewMods -gt 0) {
-                    Write-ToLog "$NewMods newer Mods downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))\mods" "Yellow"
+                    Write-ToLog "$NewMods newer Mods downloaded/copied to local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))\mods" "DarkYellow"
                 }
                 else {
                     if (Test-Path "$WorkingDir\mods\*.ps1") {
                         Write-ToLog "Mods are up to date." "Green"
                     }
                     else {
-                        Write-ToLog "No Mods are implemented..." "Yellow"
+                        Write-ToLog "No Mods are implemented..." "DarkYellow"
                     }
                 }
                 if ($DeletedMods -gt 0) {
                     Write-ToLog "$DeletedMods Mods deleted (not externally managed) from local path: $($WAUConfig.InstallLocation.TrimEnd(" ", "\"))\mods" "Red"
                 }
             }
 
-            #Test if _WAU-mods.ps1 exist: Mods for WAU (if Network is active/any Winget is installed/running as SYSTEM)
+            # Test if _WAU-mods.ps1 exist: Mods for WAU (if Network is active/any Winget is installed/running as SYSTEM)
             $Mods = "$WorkingDir\mods"
             if (Test-Path "$Mods\_WAU-mods.ps1") {
-                Write-ToLog "Running Mods for WAU..." "Yellow"
-                & "$Mods\_WAU-mods.ps1"
-                $ModsExitCode = $LASTEXITCODE
-                #If _WAU-mods.ps1 has ExitCode 1 - Re-run WAU
-                if ($ModsExitCode -eq 1) {
-                    Write-ToLog "Re-run WAU"
-                    Start-Process powershell -ArgumentList "-NoProfile -WindowStyle Hidden -ExecutionPolicy Bypass -Command `"$WorkingDir\winget-upgrade.ps1`""
-                    Exit
-                }
+                Write-ToLog "Running Mods for WAU..." "DarkYellow"
+                Test-WAUMods -WorkingDir $WorkingDir -WAUConfig $WAUConfig -GitHub_Repo $GitHub_Repo
             }
 
         }
@@ -351,7 +344,7 @@ if (Test-Network) {
         }
 
         #Get outdated Winget packages
-        Write-ToLog "Checking application updates on Winget Repository named '$($Script:WingetSourceCustom)' .." "yellow"
+        Write-ToLog "Checking application updates on Winget Repository named '$($Script:WingetSourceCustom)' .." "DarkYellow"
         $outdated = Get-WingetOutdatedApps -src $Script:WingetSourceCustom;
 
         #If something unusual happened or no update found
@@ -433,10 +426,10 @@ if (Test-Network) {
             Write-ToLog "No new update." "Green"
         }
 
-        #Test if _WAU-mods-postsys.ps1 exists: Mods for WAU (postsys) - if Network is active/any Winget is installed/running as SYSTEM _after_ SYSTEM updates
+        # Test if _WAU-mods-postsys.ps1 exists: Mods for WAU (postsys) - if Network is active/any Winget is installed/running as SYSTEM _after_ SYSTEM updates
         if ($true -eq $IsSystem) {
             if (Test-Path "$Mods\_WAU-mods-postsys.ps1") {
-                Write-ToLog "Running Mods (postsys) for WAU..." "Yellow"
+                Write-ToLog "Running Mods (postsys) for WAU..." "DarkYellow"
                 & "$Mods\_WAU-mods-postsys.ps1"
             }
         }