[ros-diffs] [reactos] 01/01: [GITHUB] build.yml: Re-enable 'build-msbuild-i386' (#6470)

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb55d984c0c03dcdaa5cd…

commit eb55d984c0c03dcdaa5cd27b34e8b7a3544eae6a
Author:     Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com>
AuthorDate: Sat Feb 10 11:36:38 2024 +0100
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sat Feb 10 13:36:38 2024 +0300

    [GITHUB] build.yml: Re-enable 'build-msbuild-i386' (#6470)
    
    Something fixed it in the meantime.
    
    Revert 0.4.15-dev-6069-g 56a45014. CORE-18911
---
 .github/workflows/build.yml | 51 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31c8af9fd33..e9953ef7f4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -291,29 +291,28 @@ jobs:
         name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
         path: build/msvc_pdb
 
-# Disable MSBuild for the moment being until a proper fix is provided -- see CORE-18911
-#  build-msbuild-i386:
-#    name: MSBuild (i386)
-#    runs-on: windows-2019
-#    steps:
-#    - name: Install Flex and Bison
-#      run: |
-#        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-#        7z x flexbison.7z -O${{github.workspace}}\bin
-#        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH
-Encoding utf8 -Append
-#        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" |
Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath
$env:GITHUB_ENV -Encoding utf8 -Append
-#    - name: Add CL to PATH
-#      uses: ilammy/msvc-dev-cmd@v1
-#      with:
-#        arch: amd64_x86
-#    - uses: actions/checkout@v4
-#      with:
-#        path: src
-#    - name: Configure
-#      run: |
-#        mkdir build
-#        cd build
-#        cmake -G "Visual Studio 16 2019" -A Win32
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386
-DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
-#    - name: Build
-#      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
+  build-msbuild-i386:
+    name: MSBuild (i386)
+    runs-on: windows-2019
+    steps:
+    - name: Install Flex and Bison
+      run: |
+        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
+        7z x flexbison.7z -O${{github.workspace}}\bin
+        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH
-Encoding utf8 -Append
+        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" |
Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath
$env:GITHUB_ENV -Encoding utf8 -Append
+    - name: Add CL to PATH
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: amd64_x86
+    - uses: actions/checkout@v4
+      with:
+        path: src
+    - name: Configure
+      run: |
+        mkdir build
+        cd build
+        cmake -G "Visual Studio 16 2019" -A Win32
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386
-DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
+    - name: Build
+      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd