From bfbea5fc7b3dacb7cd835061a38520deadb9dfe7 Mon Sep 17 00:00:00 2001
From: Derick Payne <rizonetech@gmail.com>
Date: Sun, 18 Jan 2026 22:53:35 +0200
Subject: [PATCH] ci: Add x64_AVX2 build with /arch:AVX2 optimization

Closes #4240
---
 .github/workflows/build.yml | 15 +++++++++++++--
 todo/TODO.md                |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7728b8038..015fd56ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [Win32, x64, ARM64]
+        platform: [Win32, x64, x64_AVX2, ARM64]
         configuration: [Release]
 
     steps:
@@ -85,7 +85,18 @@ jobs:
           Write-Host "Version: $Major.$Minor.$Revis.$Build ($CommitID)"
 
       - name: Build
-        run: msbuild Notepad3.sln /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /v:minimal
+        shell: pwsh
+        run: |
+          $platform = "${{ matrix.platform }}"
+          $avxFlag = ""
+          
+          # Handle x64_AVX2 special case
+          if ($platform -eq "x64_AVX2") {
+            $platform = "x64"
+            $avxFlag = "/p:EnableEnhancedInstructionSet=AdvancedVectorExtensions2"
+          }
+          
+          msbuild Notepad3.sln /m /p:Configuration=${{ matrix.configuration }} /p:Platform=$platform $avxFlag /v:minimal
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/todo/TODO.md b/todo/TODO.md
index 36a13101e..d01dbb10f 100644
--- a/todo/TODO.md
+++ b/todo/TODO.md
@@ -85,7 +85,7 @@
   - Issues: [#1665](https://github.com/rizonesoft/Notepad3/issues/1665), [#370](https://github.com/rizonesoft/Notepad3/issues/370), [#512](https://github.com/rizonesoft/Notepad3/issues/512), [#4331](https://github.com/rizonesoft/Notepad3/issues/4331), [#3652](https://github.com/rizonesoft/Notepad3/issues/3652), [#5399](https://github.com/rizonesoft/Notepad3/issues/5399)
   - See [research/autosave-backup.md](research/autosave-backup.md)
 - [ ] Installer testing on various Windows versions
-- [ ] **AVX2 Build** - Optimized build for modern CPUs
+- [x] **AVX2 Build** - ✅ Added x64_AVX2 to CI matrix
   - Issue: [#4240](https://github.com/rizonesoft/Notepad3/issues/4240)
 - [ ] Language file updates
 - [ ] **Move Beta Page to rizonesoft.com** - Host beta downloads on main site