Merge branch 'install-pacman-build'

* install-pacman-build: (52 commits)
  Add a main branch to some workflows for my own personal fork.
  Build on commit or PR to main
  include pacman in archives
  Update help
  update Git
  Bump softprops/action-gh-release from 2 to 3
  Bump peter-evans/create-pull-request from 7 to 8
  Show actual branch name and separate PR row in repository information
  Add duration tracking to test results and change hashes.txt separator to tab
  Fix variable name casing inconsistency in vendor.yml (Summary -> summary)
  fix multi-line EOF syntax according to GitHub
  fix: Handle multi-line JSON
  use double-quote for "`n"
  fix: Derive directories from the array entries
  fix: handle links to vendor repo archive URL
  parse entire JSON string at once
  Fix Format-FileSize undefined error by sourcing utils.ps1 in artifacts upload step
  Add workflow_dispatch to enable manual build workflow runs
  Fix vendor package release links and artifact download URLs
  Move Format-FileSize and Get-ArtifactDownloadUrl functions to utils.ps1
  ...

Author: daxgames

.github/workflows/build.yml

@@ -7,11 +7,11 @@ name: Build Cmder
 # Controls when the action will run. Triggers the workflow on push or pull request events but only for the main branch
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "master", "main" ]
     tags:
       - "v*"
   pull_request:
-    branches: [ "main", "dev" ]
+    branches: [ "master", "main", "development" ]
 
 #---------------------------------#
 #    environment configuration    #
@@ -47,50 +47,83 @@ jobs:
         $cmderVersion = Get-VersionStr
         $buildTime = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
 
-        # Determine branch link (handle PR merge refs)
-        $branchName = "${{ github.ref_name }}"
+        # Determine branch and PR information
+        $refName = "${{ github.ref_name }}"
+        $headRef = "${{ github.head_ref }}"
+        $eventName = "${{ github.event_name }}"
+        $prNumber = $null
+        $actualBranchName = $refName
         $branchLink = ""
-        if ($branchName -match '^(\d+)/(merge|head)$') {
-          # This is a PR merge/head ref, link to the PR
+        $prLink = ""
+        
+        # Check if this is a PR merge ref (e.g., "3061/merge")
+        if ($refName -match '^(\d+)/(merge|head)$') {
           $prNumber = $Matches[1]
-          $branchLink = "https://github.com/${{ github.repository }}/pull/$prNumber"
-        } elseif ("${{ github.event_name }}" -eq "pull_request") {
-          # This is a pull request event, link to the PR
-          $branchLink = "https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}"
+          # Use head_ref for the actual branch name if available
+          if ($headRef) {
+            $actualBranchName = $headRef
+          }
+          $branchLink = "https://github.com/${{ github.repository }}/tree/$actualBranchName"
+          $prLink = "https://github.com/${{ github.repository }}/pull/$prNumber"
+        } elseif ($eventName -eq "pull_request") {
+          # This is a pull request event
+          $prNumber = "${{ github.event.pull_request.number }}"
+          if ($headRef) {
+            $actualBranchName = $headRef
+          }
+          $branchLink = "https://github.com/${{ github.repository }}/tree/$actualBranchName"
+          $prLink = "https://github.com/${{ github.repository }}/pull/$prNumber"
         } else {
           # Regular branch, link to the branch tree
-          $branchLink = "https://github.com/${{ github.repository }}/tree/${{ github.ref_name }}"
+          $branchLink = "https://github.com/${{ github.repository }}/tree/$refName"
         }
 
         $summary = @"
         ## 📦 Build Cmder - Workflow Summary
 
-        <small>Build started: $buildTime</small>
+        <small>Build started: ``$buildTime``</small>
 
         ### Repository Information
         | Property | Value |
         | --- | --- |
         | Repository | [``${{ github.repository }}``](https://github.com/${{ github.repository }}) |
-        | Branch | [``$branchName``]($branchLink) |
+        | Branch | [``$actualBranchName``]($branchLink) |
+        $(if ($prNumber) { "| Pull Request | [#$prNumber]($prLink) |" })
         | Commit | [``${{ github.sha }}``](https://github.com/${{ github.repository }}/commit/${{ github.sha }}) |
         | Actor | [@${{ github.actor }}](https://github.com/${{ github.actor }}) |
         | Workflow | ``${{ github.workflow }}`` |
         | Cmder Version | **$cmderVersion** |
 
         ---
 
-        ### 📁 Vendor Packages
+        ### 🗃️ Vendor Packages ([sources.json](vendor/sources.json))
         | Package | Version |
         | --- | --- |
         "@
 
         # Read vendor sources.json and add to summary
-        $vendorSources = Get-Content "vendor/sources.json" | ConvertFrom-Json
+        $vendorSources = Get-Content -Raw "vendor/sources.json" | ConvertFrom-Json
         if ($vendorSources.Count -eq 0) {
           $summary += "`n| _No vendor packages found_ | |"
         } else {
           foreach ($vendor in $vendorSources) {
-            $summary += "`n| ``$($vendor.name)`` | $($vendor.version) |"
+            # Create release link based on vendor package
+            $versionLink = "$($vendor.version)"
+            if ($vendor.url) {
+              # Extract owner/repo/tag from the URL and create release link
+              # Handle both /releases/download/ and /archive/ URLs
+              if ($vendor.url -match 'github\.com/([^/]+)/([^/]+)/(releases/download|archive)/([^/]+)') {
+                $owner = $Matches[1]
+                $repo = $Matches[2]
+                $pathType = $Matches[3]
+                $tag = $Matches[4]
+                if ($pathType -eq 'archive') {
+                  $tag = $tag -replace '\.(?:tar\.gz|tgz|zip)$', ''
+                }
+                $versionLink = "[$($vendor.version)](https://github.com/$owner/$repo/releases/tag/$tag)"
+              }
+            }
+            $summary += "`n| ``$($vendor.name)`` | $versionLink |"
           }
         }
 
@@ -99,12 +132,12 @@ jobs:
         $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v3
 
     - name: Build Cmder Launcher
       shell: pwsh
       working-directory: scripts
-      run: .\build.ps1 -Compile -verbose -InstallPacman
+      run: .\build.ps1 -Compile -verbose -terminal -all -installPacman
 
     - name: Summary - Build completed
       if: success()
@@ -114,8 +147,6 @@ jobs:
 
         ---
 
-        ### Build Status
-
         ✅ Cmder built successfully.
 
         "@
@@ -125,89 +156,106 @@ jobs:
     - name: Pack the built files
       shell: pwsh
       working-directory: scripts
-      run: .\pack.ps1 -verbose
+      run: .\pack.ps1 -verbose -terminal all
+
+    - name: Upload artifact (cmder_win_mini.zip)
+      uses: actions/upload-artifact@v4
+      with:
+        path: build/cmder_win_mini.zip
+        name: cmder_win_mini.zip
+        if-no-files-found: error
+
+    - name: Upload artifact (cmder_win.7z)
+      uses: actions/upload-artifact@v4
+      with:
+        path: build/cmder_win.7z
+        name: cmder_win.7z
+        if-no-files-found: error
+
+    - name: Upload artifact (cmder_win.zip)
+      uses: actions/upload-artifact@v4
+      with:
+        path: build/cmder_win.zip
+        name: cmder_win.zip
+        if-no-files-found: error
+
+    - name: Upload artifact (cmder_wt.zip)
+      uses: actions/upload-artifact@v4
+      with:
+        path: build/cmder_wt.zip
+        name: cmder_wt.zip
+        if-no-files-found: error
+
+    - name: Upload artifact (cmder_wt.7z)
+      uses: actions/upload-artifact@v4
+      with:
+        path: build/cmder_wt.7z
+        name: cmder_wt.7z
+
+    - name: Upload artifact (cmder_wt_mini.zip)
+      uses: actions/upload-artifact@v4
+      with:
+        path: build/cmder_wt_mini.zip
+        name: cmder_wt_mini.zip
 
     - name: Upload artifact (cmder.zip)
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         path: build/cmder.zip
         name: cmder.zip
+        archive: false
         if-no-files-found: error
 
     - name: Upload artifact (cmder.7z)
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         path: build/cmder.7z
         name: cmder.7z
+        archive: false
 
     - name: Upload artifact (cmder_mini.zip)
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         path: build/cmder_mini.zip
         name: cmder_mini.zip
+        archive: false
 
     - name: Upload artifact (hashes.txt)
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         path: build/hashes.txt
         name: hashes.txt
+        archive: false
 
     - name: Summary - Artifacts uploaded
       if: success()
       shell: pwsh
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
+        # Source utility functions
+        . scripts/utils.ps1
+        
         $summary = @"
 
-        ---
-
         ### 🗃️ Artifacts
 
-        | Artifact | Size | Download | Hash (SHA256) |
-        | --- | --- | --- | --- |
+        | Artifact | Size | Hash (SHA256) |
+        | --- | --- | --- |
         "@
 
-        # Function to get artifact download URL with retry logic
-        function Get-ArtifactDownloadUrl {
-          param(
-            [string]$ArtifactName,
-            [int]$MaxRetries = 3,
-            [int]$DelaySeconds = 2
-          )
-
-          for ($i = 0; $i -lt $MaxRetries; $i++) {
-            try {
-              # Use GitHub CLI to get artifact information
-              $artifactsJson = gh api "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" --jq ".artifacts[] | select(.name == `"$ArtifactName`")"
-
-              if ($artifactsJson) {
-                $artifact = $artifactsJson | ConvertFrom-Json
-                if ($artifact.archive_download_url) {
-                  return $artifact.archive_download_url
-                }
-              }
-            } catch {
-              Write-Host "Attempt $($i + 1) failed to get artifact URL for $ArtifactName : $_"
-            }
-
-            if ($i -lt ($MaxRetries - 1)) {
-              Start-Sleep -Seconds $DelaySeconds
-            }
-          }
-
-          return $null
-        }
-
-        $artifacts = @("cmder.zip", "cmder.7z", "cmder_mini.zip", "hashes.txt")
-        foreach ($artifact in $artifacts) {
-          $path = "build/$artifact"
-          if (Test-Path $path) {
-            $size = (Get-Item $path).Length / 1MB
+        # Get all files from the build directory (excluding directories and hidden files)
+        if (Test-Path "build") {
+          $buildFiles = Get-ChildItem -Path "build" -File | Where-Object { -not $_.Name.StartsWith('.') } | Sort-Object Name
+          
+          foreach ($file in $buildFiles) {
+            $artifact = $file.Name
+            $path = $file.FullName
+            $sizeFormatted = Format-FileSize -Bytes $file.Length
             $hash = (Get-FileHash $path -Algorithm SHA256).Hash
 
             # Try to get the actual artifact download URL
-            $downloadUrl = Get-ArtifactDownloadUrl -ArtifactName $artifact
+            $downloadUrl = Get-ArtifactDownloadUrl -ArtifactName $artifact -Repository "${{ github.repository }}" -RunId "${{ github.run_id }}"
             $warning = ""
 
             if (-not $downloadUrl) {
@@ -219,21 +267,21 @@ jobs:
             # Determine emoji based on file type
             if ($artifact -match '\.txt$') {
               $emoji = "📄"
-            } elseif ($artifact -match '\.(zip|7z)$') {
+            } elseif ($artifact -match '\.(zip|rar|7z)$') {
               $emoji = "🗄️"
             } else {
               $emoji = "📦"
             }
 
-            $summary += "`n| $emoji ``$artifact`` | $([math]::Round($size, 2)) MB | [📥 Download$warning]($downloadUrl) | ``$hash`` |"
+            $summary += "`n| $emoji [``$artifact``$warning]($downloadUrl) | $sizeFormatted | ``$hash`` |"
           }
         }
         $summary += "`n"
 
         $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
 
     - name: Create Release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v3
       with:
         files: |
           build/cmder.zip

.github/workflows/codeql.yml

@@ -8,15 +8,15 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main", "dev" ]
+    branches: [ "master", "main", "development" ]
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
       - '.github/**'
       - '**/.gitignore'
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "main", "dev" ]
+    branches: [ "master", "main", "development" ]
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
@@ -51,16 +51,16 @@ jobs:
       shell: pwsh
       run: |
         $summary = @"
-          ## 🔒 CodeQL Security Analysis - Workflow Summary
+        ## 🔒 CodeQL Security Analysis - Workflow Summary
 
-          ### Analysis Configuration
+        ### Analysis Configuration
 
-          | Property | Value |
-          | --- | --- |
-          | Repository | ``${{ github.repository }}`` |
-          | Branch | ``${{ github.ref_name }}`` |
-          | Language | ``${{ matrix.language }}`` |
-          | Commit | ``${{ github.sha }}`` |
+        | Property | Value |
+        | --- | --- |
+        | Repository | ``${{ github.repository }}`` |
+        | Branch | ``${{ github.ref_name }}`` |
+        | Language | ``${{ matrix.language }}`` |
+        | Commit | ``${{ github.sha }}`` |
 
         "@
 
@@ -79,7 +79,7 @@ jobs:
         # queries: security-extended,security-and-quality
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v3
 
     - name: Build Cmder Launcher
       shell: pwsh
@@ -91,9 +91,9 @@ jobs:
       shell: pwsh
       run: |
         $summary = @"
-          ### ✅ Build Completed
+        ### ✅ Build Completed
 
-          Cmder launcher built successfully for CodeQL analysis.
+        Cmder launcher built successfully for CodeQL analysis.
 
         "@
 
@@ -109,13 +109,13 @@ jobs:
       shell: pwsh
       run: |
         $summary = @"
-          ### 🔍 CodeQL Analysis Results
+        ### 🔍 CodeQL Analysis Results
 
-          ✅ CodeQL security analysis completed successfully.
+        ✅ CodeQL security analysis completed successfully.
 
-          **Language analyzed:** ``${{ matrix.language }}``
+        **Language analyzed:** ``${{ matrix.language }}``
 
-          > Check the Security tab for detailed findings and recommendations.
+        > Check the Security tab for detailed findings and recommendations.
         "@
 
         $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8