From f604b06d261fefe9b726baed5c01e015211d4a30 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sat, 8 Mar 2025 15:26:33 -0500 Subject: [PATCH 01/12] update windows terminal, clink, and git --- vendor/sources.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 1a6238457..05fb2eaf5 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,18 +1,18 @@ [ { "name": "windows-terminal", - "version": "1.20.11271.0", - "url": "https://github.com/microsoft/terminal/releases/download/v1.20.11271.0/Microsoft.WindowsTerminal_1.20.11271.0_x64.zip" + "version": "1.23.10353.0", + "url": "https://github.com/microsoft/terminal/releases/download/v1.23.10353.0/Microsoft.WindowsTerminalPreview_1.23.10353.0_x64.zip" }, { "name": "git-for-windows", - "version": "2.47.0.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.47.0.windows.1/PortableGit-2.47.0-64-bit.7z.exe" + "version": "2.47.1.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/PortableGit-2.47.1-64-bit.7z.exe" }, { "name": "clink", - "version": "1.7.3", - "url": "https://github.com/chrisant996/clink/releases/download/v1.7.3/clink.1.7.3.f8fb96.zip" + "version": "1.7.12", + "url": "https://github.com/chrisant996/clink/releases/download/v1.7.12/clink.1.7.12.625e8b.zip" }, { "name": "conemu-maximus5", From f4b8d0852d0ac05caa759326e743dd285d3a3aa6 Mon Sep 17 00:00:00 2001 From: "Dax t. Games" Date: Sat, 6 Dec 2025 18:56:05 +0000 Subject: [PATCH 02/12] update clink --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index f86c7fc55..dceb4cf44 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "1.8.8", - "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip" + "version": "1.9.3", + "url": "https://github.com/chrisant996/clink/releases/download/v1.9.3/clink.1.9.3.0ef759.zip" }, { "name": "conemu-maximus5", From e4a66402a66c9d73e75e006656ee7c47beee87fe Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 14 Dec 2025 11:10:49 -0500 Subject: [PATCH 03/12] update sources --- .gitignore | 2 +- vendor/sources.json | 49 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 3ca812444..8edad6f19 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ scripts/packer/iso/*.iso scripts/packer/packer_cache scripts/packer/output-* *.box - +*.code-workspace diff --git a/vendor/sources.json b/vendor/sources.json index cfb7bd983..b528368ce 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,26 +1,27 @@ [ - "name": "git-for-windows", - "version": "2.51.2.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/PortableGit-2.51.2-64-bit.7z.exe" - }, - { - "name": "clink", - "version": "1.8.8", - "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip" - }, - { - "name": "conemu-maximus5", - "version": "23.07.24", - "url": "https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z" - }, - { - "name": "windows-terminal", - "version": "1.23.12811.0", - "url": "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.WindowsTerminal_1.23.12811.0_x64.zip" - }, - { - "name": "clink-completions", - "version": "0.6.6", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip" - } + { + "name": "git-for-windows", + "version": "2.52.0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/PortableGit-2.52.0-64-bit.7z.exe" + }, + { + "name": "clink", + "version": "1.9.5", + "url": "https://github.com/chrisant996/clink/releases/download/v1.9.5/clink.1.9.5.ee6b4f.zip" + }, + { + "name": "conemu-maximus5", + "version": "23.07.24", + "url": "https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z" + }, + { + "name": "windows-terminal", + "version": "1.23.12811.0", + "url": "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.WindowsTerminal_1.23.12811.0_x64.zip" + }, + { + "name": "clink-completions", + "version": "0.6.7", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.7.zip" + } ] From f9d79723a8d6f2a56c261bb868e3f757fffc8b21 Mon Sep 17 00:00:00 2001 From: "Dax t. Games" Date: Sun, 14 Dec 2025 19:10:43 +0000 Subject: [PATCH 04/12] Add install-pacman.sh --- vendor/bin/install_pacman.sh | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 vendor/bin/install_pacman.sh diff --git a/vendor/bin/install_pacman.sh b/vendor/bin/install_pacman.sh new file mode 100644 index 000000000..75945189e --- /dev/null +++ b/vendor/bin/install_pacman.sh @@ -0,0 +1,115 @@ +#!/usr/bin/env bash + +# Based on: https://github.com/mcgitty/pacman-for-git +# My Fork: https://github.com/daxgames/pacman-for-git + +export bin_source=${1:-https://github.com/daxgames/pacman-for-git/raw/refs/heads/main} + +if [[ "$HOSTTYPE" == "i686" ]]; then + pacman=( + pacman-6.0.0-4-i686.pkg.tar.zst + pacman-mirrors-20210703-1-any.pkg.tar.zst + msys2-keyring-1~20210213-2-any.pkg.tar.zst + ) + + zstd=zstd-1.5.0-1-i686.pkg.tar.xz + zstd_win=https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-v1.5.5-win32.zip +else + pacman=( + pacman-6.0.1-18-x86_64.pkg.tar.zst + pacman-mirrors-20220205-1-any.pkg.tar.zst + msys2-keyring-1~20220623-1-any.pkg.tar.zst + ) + + zstd=zstd-1.5.2-1-x86_64.pkg.tar.xz + zstd_win=https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-v1.5.5-win64.zip +fi + +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Downloading pacman files... +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +for f in "${pacman[@]}"; do + echo "Running: curl -sLkf -o \"$HOME/Downloads/$f\" \"${bin_source}/$f\"" + curl -sLkf -o "$HOME/Downloads/$f" "${bin_source}/$f" || exit 1 +done +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" + +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Downloading zstd binaries... +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo "Running: curl -sLkf -o \"$HOME/Downloads/$zstd\" \"${bin_source}/$zstd\"" +curl -sLkf -o "$HOME/Downloads/$zstd" "${bin_source}/$zstd" || exit 1 +echo "Running: curl -sLkf -o \"$HOME/Downloads/$(basename \"${zstd_win}\")\" \"$zstd_win\"" +curl -sLkf -o "$HOME/Downloads/$(basename "${zstd_win}")" "$zstd_win" || exit 1 +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" + +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Downloading pacman.conf... +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo "Running: curl -Lk https://raw.githubusercontent.com/msys2/MSYS2-packages/7858ee9c236402adf569ac7cff6beb1f883ab67c/pacman/pacman.conf" +curl -sLk https://raw.githubusercontent.com/msys2/MSYS2-packages/7858ee9c236402adf569ac7cff6beb1f883ab67c/pacman/pacman.conf -o /etc/pacman.conf || exit 1 + +pushd "$HOME/Downloads" +[[ -d "$(basename "${zstd_win}" | sed 's/\.zip$//')" ]] && \ + rm -rf "$(basename "${zstd_win}" | sed 's/\.zip$//')" +unzip "$HOME/Downloads/$(basename "${zstd_win}")" +export PATH="$PATH:$HOME/Downloads/$(basename "${zstd_win}" | sed 's/\.zip$//')" +popd +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" + +cd / +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Installing pacman files... +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo "Extracting zstd to /usr..." +tar x --xz -vf "$HOME/Downloads/$zstd" usr + +for f in "${pacman[@]}"; do + echo "Extracting $f to /usr and /etc..." + tar x --zstd -vf "$HOME/Downloads/$f" usr etc 2>/dev/null +done +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" + +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Initializing pacman... +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +mkdir -p /var/lib/pacman +ln -sf "$(which gettext)" /usr/bin/ +pacman-key --init +pacman-key --populate msys2 +pacman -Syu --noconfirm +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" + +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Getting package versions for the installed Git release +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +t=$(grep -E 'mingw-w64-[ix_0-9]+-git ' /etc/package-versions.txt) +echo "Found package version line: $t" + +curl --help >/dev/null 2>&1 || { echo "ERROR: curl is not installed properly."; exit 1; } + +echo "Getting commit ID that matches '$t' from github pacman-for-git..." +t=$(curl -sLk "${bin_source}/version-tags.txt" | grep "$t") +echo "Full line from version-tags.txt: '$t'" + +[[ "$t" == "" ]] && echo "ERROR: Commit ID not logged in github pacman-for-git." && exit 1 +echo -e "Using commit ID: '${t##* }'" +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" + +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +echo Downloading package database files for the installed Git release +echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +b=64 && [[ "$t" == *-i686-* ]] && b=32 +URL="https://github.com/git-for-windows/git-sdk-$b/raw/${t##* }" +while read -r p v; do + d="/var/lib/pacman/local/$p-$v" + mkdir -p "$d" + echo "$d" + + for f in desc files mtree; do + curl -fsSL "$URL$d/$f" -o "$d/$f" + done + + [[ ! -f "$d/desc" ]] && rmdir "$d" && echo "Missing $d" +done < /etc/package-versions.txt +echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" From df0785d71e00071953a6b8c82fc69a5ccc45dbf6 Mon Sep 17 00:00:00 2001 From: "Dax t. Games" Date: Sun, 14 Dec 2025 19:24:26 +0000 Subject: [PATCH 05/12] Add a disclaimer --- vendor/bin/install_pacman.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vendor/bin/install_pacman.sh b/vendor/bin/install_pacman.sh index 75945189e..6d72d0714 100644 --- a/vendor/bin/install_pacman.sh +++ b/vendor/bin/install_pacman.sh @@ -1,7 +1,17 @@ #!/usr/bin/env bash # Based on: https://github.com/mcgitty/pacman-for-git -# My Fork: https://github.com/daxgames/pacman-for-git +# Dax T. Games Fork: https://github.com/daxgames/pacman-for-git + +# Disclaimer: Use at your own risk. +# +# This script modifies system files and installs the pacman package manager into your Git for Windows environment. +# +# While it has been tested in various Git for Windows versions, there is always a risk of data loss or system instability when running scripts that alter executable files and shared libraries. +# +# Make sure to back up any important data before proceeding. +# +# Always review and understand scripts from external sources prior to execution. export bin_source=${1:-https://github.com/daxgames/pacman-for-git/raw/refs/heads/main} From 83df88d5a32dedc8234f42fa925dcbf89524654e Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 22 Dec 2025 09:42:30 -0500 Subject: [PATCH 06/12] fixes for windows 10 --- vendor/bin/install_pacman.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vendor/bin/install_pacman.sh b/vendor/bin/install_pacman.sh index 6d72d0714..dd725ca4a 100644 --- a/vendor/bin/install_pacman.sh +++ b/vendor/bin/install_pacman.sh @@ -14,6 +14,9 @@ # Always review and understand scripts from external sources prior to execution. export bin_source=${1:-https://github.com/daxgames/pacman-for-git/raw/refs/heads/main} +export HOME=$(cygpath -u "$USERPROFILE") +echo "Using binary source: $bin_source" +echo "Using HOME directory: $HOME" if [[ "$HOSTTYPE" == "i686" ]]; then pacman=( @@ -87,7 +90,7 @@ mkdir -p /var/lib/pacman ln -sf "$(which gettext)" /usr/bin/ pacman-key --init pacman-key --populate msys2 -pacman -Syu --noconfirm +pacman -Syu --noconfirm --disable-download-timeout echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- From 64316333eea0ae85150a0e28e16fbeb8018c950f Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 25 Dec 2025 15:59:09 -0500 Subject: [PATCH 07/12] x --- vendor/bin/install_pacman.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vendor/bin/install_pacman.sh b/vendor/bin/install_pacman.sh index 6d72d0714..dd725ca4a 100644 --- a/vendor/bin/install_pacman.sh +++ b/vendor/bin/install_pacman.sh @@ -14,6 +14,9 @@ # Always review and understand scripts from external sources prior to execution. export bin_source=${1:-https://github.com/daxgames/pacman-for-git/raw/refs/heads/main} +export HOME=$(cygpath -u "$USERPROFILE") +echo "Using binary source: $bin_source" +echo "Using HOME directory: $HOME" if [[ "$HOSTTYPE" == "i686" ]]; then pacman=( @@ -87,7 +90,7 @@ mkdir -p /var/lib/pacman ln -sf "$(which gettext)" /usr/bin/ pacman-key --init pacman-key --populate msys2 -pacman -Syu --noconfirm +pacman -Syu --noconfirm --disable-download-timeout echo -e "\n=-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" echo =-=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- From be5b64122cd55a62061ca18c45874e87c47503e4 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Fri, 16 Jan 2026 16:55:16 -0500 Subject: [PATCH 08/12] add installPacman switch to build.sh --- scripts/build.ps1 | 9 ++++++++- {vendor/bin => scripts}/install_pacman.sh | 0 2 files changed, 8 insertions(+), 1 deletion(-) rename {vendor/bin => scripts}/install_pacman.sh (100%) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 634d2467c..9a0be078a 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -60,7 +60,10 @@ Param( [string]$terminal = 'all', # Build launcher if you have MSBuild tools installed - [switch]$Compile + [switch]$Compile, + + # Install pacman if not present + [switch]$InstallPacman ) # Get the scripts and cmder root dirs we are building in. @@ -199,6 +202,10 @@ if (-not $noVendor) { Copy-Item $($saveTo + "git-prompt.sh") $($saveTo + "git-for-windows/etc/profile.d/git-prompt.sh") } + if ( $InstallPacman -and !(Test-Path $($saveTo + "git-for-windows/usr/bin/pacman.exe") ) ) { + Write-Verbose "Installing pacman..." + & $($saveTo + "git-for-windows/bin/bash.exe") $($saveTo + "../scripts/install_pacman.sh") + } Pop-Location } diff --git a/vendor/bin/install_pacman.sh b/scripts/install_pacman.sh similarity index 100% rename from vendor/bin/install_pacman.sh rename to scripts/install_pacman.sh From 0dd8459eac0349b36778f6b7e116f15d30d708b7 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 22 Feb 2026 14:44:42 -0500 Subject: [PATCH 09/12] cleanup --- vendor/sources.json | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index b528368ce..df1ae3e5f 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,27 +1,27 @@ [ - { - "name": "git-for-windows", - "version": "2.52.0.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/PortableGit-2.52.0-64-bit.7z.exe" - }, - { - "name": "clink", - "version": "1.9.5", - "url": "https://github.com/chrisant996/clink/releases/download/v1.9.5/clink.1.9.5.ee6b4f.zip" - }, - { - "name": "conemu-maximus5", - "version": "23.07.24", - "url": "https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z" - }, - { - "name": "windows-terminal", - "version": "1.23.12811.0", - "url": "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.WindowsTerminal_1.23.12811.0_x64.zip" - }, - { - "name": "clink-completions", - "version": "0.6.7", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.7.zip" - } + { + "name": "git-for-windows", + "version": "2.52.0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/PortableGit-2.52.0-64-bit.7z.exe" + }, + { + "name": "clink", + "version": "1.9.5", + "url": "https://github.com/chrisant996/clink/releases/download/v1.9.5/clink.1.9.5.ee6b4f.zip" + }, + { + "name": "conemu-maximus5", + "version": "23.07.24", + "url": "https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z" + }, + { + "name": "windows-terminal", + "version": "1.23.12811.0", + "url": "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.WindowsTerminal_1.23.12811.0_x64.zip" + }, + { + "name": "clink-completions", + "version": "0.6.7", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.7.zip" + } ] From a0aecb6b65023fca90a86aee989431281c3e2445 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 22 Feb 2026 14:54:45 -0500 Subject: [PATCH 10/12] Fix CodeQL --- .github/workflows/codeql.yml | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 16ebd4072..b153f4a34 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,17 +50,17 @@ jobs: - name: Summary - CodeQL analysis started shell: pwsh run: | - echo "## 🔒 CodeQL Security Analysis - Workflow Summary" >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY - echo "### Analysis Configuration" >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY - echo "| Property | Value |" >> $env:GITHUB_STEP_SUMMARY - echo "| --- | --- |" >> $env:GITHUB_STEP_SUMMARY - echo "| Repository | \`${{ github.repository }}\` |" >> $env:GITHUB_STEP_SUMMARY - echo "| Branch | \`${{ github.ref_name }}\` |" >> $env:GITHUB_STEP_SUMMARY - echo "| Language | \`${{ matrix.language }}\` |" >> $env:GITHUB_STEP_SUMMARY - echo "| Commit | \`${{ github.sha }}\` |" >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '## 🔒 CodeQL Security Analysis - Workflow Summary' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '### Analysis Configuration' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Property | Value |' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| --- | --- |' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Repository | `${{ github.repository }}` |" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Branch | `${{ github.ref_name }}` |" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Language | `${{ matrix.language }}` |" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Commit | `${{ github.sha }}` |" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -86,10 +86,10 @@ jobs: if: success() shell: pwsh run: | - echo "### ✅ Build Completed" >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY - echo "Cmder launcher built successfully for CodeQL analysis." >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '### ✅ Build Completed' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value 'Cmder launcher built successfully for CodeQL analysis.' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 @@ -100,10 +100,10 @@ jobs: if: success() shell: pwsh run: | - echo "### 🔍 CodeQL Analysis Results" >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY - echo "✅ CodeQL security analysis completed successfully." >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY - echo "**Language analyzed:** \`${{ matrix.language }}\`" >> $env:GITHUB_STEP_SUMMARY - echo "" >> $env:GITHUB_STEP_SUMMARY - echo "> Check the Security tab for detailed findings and recommendations." >> $env:GITHUB_STEP_SUMMARY + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '### 🔍 CodeQL Analysis Results' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '✅ CodeQL security analysis completed successfully.' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "**Language analyzed:** `${{ matrix.language }}`" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '> Check the Security tab for detailed findings and recommendations.' From 9b1e7a24f7f764c20047fdcfefde089061a34692 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 22 Feb 2026 15:00:15 -0500 Subject: [PATCH 11/12] Fix CodeQL --- .github/workflows/codeql.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b153f4a34..a66665784 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -56,10 +56,10 @@ jobs: Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Property | Value |' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| --- | --- |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Repository | `${{ github.repository }}` |" - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Branch | `${{ github.ref_name }}` |" - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Language | `${{ matrix.language }}` |" - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "| Commit | `${{ github.sha }}` |" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Repository | `${{ github.repository }}` |' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Branch | `${{ github.ref_name }}` |' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Language | `${{ matrix.language }}` |' + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Commit | `${{ github.sha }}` |' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' # Initializes the CodeQL tools for scanning. @@ -104,6 +104,6 @@ jobs: Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '✅ CodeQL security analysis completed successfully.' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value "**Language analyzed:** `${{ matrix.language }}`" + Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '**Language analyzed:** `${{ matrix.language }}`' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '> Check the Security tab for detailed findings and recommendations.' From 7da225a3b94c8a79664f655ba5b1dd39ffbf5f87 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 22 Feb 2026 15:04:18 -0500 Subject: [PATCH 12/12] Fix CodeQl --- .github/workflows/codeql.yml | 53 +++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a66665784..1497bf9ac 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,17 +50,20 @@ jobs: - name: Summary - CodeQL analysis started shell: pwsh run: | - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '## 🔒 CodeQL Security Analysis - Workflow Summary' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '### Analysis Configuration' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Property | Value |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| --- | --- |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Repository | `${{ github.repository }}` |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Branch | `${{ github.ref_name }}` |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Language | `${{ matrix.language }}` |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '| Commit | `${{ github.sha }}` |' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + $summary = @( + '## 🔒 CodeQL Security Analysis - Workflow Summary' + '' + '### Analysis Configuration' + '' + '| Property | Value |' + '| --- | --- |' + '| Repository | `${{ github.repository }}` |' + '| Branch | `${{ github.ref_name }}` |' + '| Language | `${{ matrix.language }}` |' + '| Commit | `${{ github.sha }}` |' + '' + ) + $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -86,10 +89,13 @@ jobs: if: success() shell: pwsh run: | - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '### ✅ Build Completed' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value 'Cmder launcher built successfully for CodeQL analysis.' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' + $summary = @( + '### ✅ Build Completed' + '' + 'Cmder launcher built successfully for CodeQL analysis.' + '' + ) + $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v4 @@ -100,10 +106,13 @@ jobs: if: success() shell: pwsh run: | - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '### 🔍 CodeQL Analysis Results' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '✅ CodeQL security analysis completed successfully.' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '**Language analyzed:** `${{ matrix.language }}`' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '' - Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '> Check the Security tab for detailed findings and recommendations.' + $summary = @( + '### 🔍 CodeQL Analysis Results' + '' + '✅ CodeQL security analysis completed successfully.' + '' + '**Language analyzed:** `${{ matrix.language }}`' + '' + '> Check the Security tab for detailed findings and recommendations.' + ) + $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY