From fe92094cc44fadeb7569e1ab98eb2698ffa155bf Mon Sep 17 00:00:00 2001
From: dpasukhi <dpasukhi@opencascade.com>
Date: Fri, 27 Dec 2024 20:32:18 +0000
Subject: [PATCH] Testing - GH Mesa3D script update #216

Update Mesa3D download links and set environment variables for software rendering
---
 .../build-and-test-multiplatform.yml          | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-and-test-multiplatform.yml b/.github/workflows/build-and-test-multiplatform.yml
index a93fd19170..b6b103f180 100644
--- a/.github/workflows/build-and-test-multiplatform.yml
+++ b/.github/workflows/build-and-test-multiplatform.yml
@@ -41,13 +41,14 @@ jobs:
 
     - name: Download and extract Mesa3D
       run: |
-        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.2.5/mesa3d-24.2.5-release-msvc.7z
+        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.3.2/mesa3d-24.3.2-release-mingw.7z
         7z x mesa3d.7z -omesa3d
 
     - name: Run system-wide deployment
       run: |
         cd mesa3d
         .\systemwidedeploy.cmd 1
+        .\systemwidedeploy.cmd 5
       shell: cmd
 
     - name: Configure OCCT
@@ -111,13 +112,14 @@ jobs:
 
     - name: Download and extract Mesa3D
       run: |
-        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.2.5/mesa3d-24.2.5-release-msvc.7z
+        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.3.2/mesa3d-24.3.2-release-mingw.7z
         7z x mesa3d.7z -omesa3d
 
     - name: Run system-wide deployment
       run: |
         cd mesa3d
         .\systemwidedeploy.cmd 1
+        .\systemwidedeploy.cmd 5
       shell: cmd
 
     - name: Configure OCCT
@@ -413,13 +415,14 @@ jobs:
 
     - name: Download and extract Mesa3D
       run: |
-        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.2.5/mesa3d-24.2.5-release-msvc.7z
+        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.3.2/mesa3d-24.3.2-release-mingw.7z
         7z x mesa3d.7z -omesa3d
 
     - name: Run system-wide deployment
       run: |
         cd mesa3d
         .\systemwidedeploy.cmd 1
+        .\systemwidedeploy.cmd 5
       shell: cmd
 
     - name: Install Visual C++ 2010 Redistributable
@@ -435,6 +438,7 @@ jobs:
         DRAWEXE.exe -v -c testgrid
       shell: cmd
       env:
+        LIBGL_ALWAYS_SOFTWARE: 1
         CSF_TestScriptsPath: ${{ github.workspace }}/tests
         CSF_TestDataPath: ${{ github.workspace }}/data
 
@@ -484,13 +488,14 @@ jobs:
 
     - name: Download and extract Mesa3D
       run: |
-        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.2.5/mesa3d-24.2.5-release-msvc.7z
+        curl -L -o mesa3d.7z https://github.com/pal1000/mesa-dist-win/releases/download/24.3.2/mesa3d-24.3.2-release-mingw.7z
         7z x mesa3d.7z -omesa3d
 
     - name: Run system-wide deployment
       run: |
         cd mesa3d
         .\systemwidedeploy.cmd 1
+        .\systemwidedeploy.cmd 5
       shell: cmd
 
     - name: Install Visual C++ 2010 Redistributable
@@ -506,6 +511,7 @@ jobs:
         DRAWEXE.exe -v -c testgrid
       shell: cmd
       env:
+        LIBGL_ALWAYS_SOFTWARE: 1
         CSF_TestScriptsPath: ${{ github.workspace }}/tests
         CSF_TestDataPath: ${{ github.workspace }}/data
 
@@ -647,9 +653,6 @@ jobs:
     - name: Start Xvfb
       run: Xvfb :99 -screen 0 1920x1080x24 &
 
-    - name: Set DISPLAY environment variable
-      run: echo "DISPLAY=:99" >> $GITHUB_ENV
-
     - name: Download test data
       run: |
         cd data
@@ -662,9 +665,6 @@ jobs:
         name: install-linux-clang-x64
         path: install
 
-    - name: Set LIBGL_ALWAYS_SOFTWARE environment variable
-      run: echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
-
     - name: Set execute permissions on DRAWEXE
       run: chmod +x install/bin/DRAWEXE
 
@@ -710,9 +710,6 @@ jobs:
     - name: Start Xvfb
       run: Xvfb :99 -screen 0 1920x1080x24 &
 
-    - name: Set DISPLAY environment variable
-      run: echo "DISPLAY=:99" >> $GITHUB_ENV
-
     - name: Download test data
       run: |
         cd data
@@ -725,9 +722,6 @@ jobs:
         name: install-linux-gcc-x64
         path: install
 
-    - name: Set LIBGL_ALWAYS_SOFTWARE environment variable
-      run: echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
-
     - name: Set execute permissions on DRAWEXE
       run: chmod +x install/bin/DRAWEXE