Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing - GH Mesa3D script update #216

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Testing - GH Mesa3D script update #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions .github/workflows/build-and-test-multiplatform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
Loading