Skip to content

Commit

Permalink
CI: fix crashes on windows-latest version 20240603
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Jun 6, 2024
1 parent f8769ef commit 9ff56b3
Showing 1 changed file with 58 additions and 6 deletions.
64 changes: 58 additions & 6 deletions .github/workflows/cmake_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,35 @@ jobs:
generator: Ninja
cache-name: cmake-msvc
steps:

- name: Check vcruntime140
shell: pwsh
run: |
echo ((Get-Command vcruntime140.dll).Path)
echo ((Get-Command vcruntime140.dll).Version)
- name: Remove conflicting libraries
shell: bash -l {0}
run: |
mv C:/Strawberry C:/Strawberry.disabled || /bin/true
mv "C:/Program Files/OpenSSL/lib" "C:/Program Files/OpenSSL/lib.disabled" || /bin/true
# Avoid outdated vcruntime140.dll to be used. Cf https://github.com/actions/runner-images/issues/10004#issuecomment-2153091255
#find "C:/hostedtoolcache" -name "vcruntime140.dll" -exec rm {} \;
mkdir c:/vcruntime
cp C:/Windows/system32/vcruntime140.dll c:/vcruntime
- name: Set environment
shell: pwsh
run: |
$env:PATH="c:/vcruntime;$env:PATH"
echo "PATH=$env:PATH" >> $env:GITHUB_ENV
- name: Check vcruntime140
shell: pwsh
run: |
echo ((Get-Command vcruntime140.dll).Path)
echo ((Get-Command vcruntime140.dll).Version)
# To avoid git clone to mess with the line endings of GDAL autotest data
# files that look like text, but should be handled as binary content
- name: Set git core.autocrlf to false
Expand Down Expand Up @@ -441,12 +470,6 @@ jobs:
unzip install-win10-vs2019-x64-rev6309.zip
mv install install-pdfium
- name: Remove conflicting libraries
shell: bash -l {0}
run: |
rm -rf C:/Strawberry || /bin/true
rm -rf "C:/Program Files/OpenSSL/lib" || /bin/true
- name: Configure
shell: bash -l {0}
# Disable MySQL because of "error LNK2038: mismatch detected for '_MSC_VER': value '1800' doesn't match value '1900' in ogrmysqldatasource.obj" and other errors
Expand Down Expand Up @@ -501,6 +524,35 @@ jobs:
generator: Visual Studio 17 2022
GDAL_PYTHON_BINDINGS_WITHOUT_NUMPY: YES
steps:

- name: Check vcruntime140
shell: pwsh
run: |
echo ((Get-Command vcruntime140.dll).Path)
echo ((Get-Command vcruntime140.dll).Version)
- name: Remove conflicting libraries
shell: bash -l {0}
run: |
mv C:/Strawberry C:/Strawberry.disabled || /bin/true
mv "C:/Program Files/OpenSSL/lib" "C:/Program Files/OpenSSL/lib.disabled" || /bin/true
# Avoid outdated vcruntime140.dll to be used. Cf https://github.com/actions/runner-images/issues/10004#issuecomment-2153091255
#find "C:/hostedtoolcache" -name "vcruntime140.dll" -exec rm {} \;
mkdir c:/vcruntime
cp C:/Windows/system32/vcruntime140.dll c:/vcruntime
- name: Set environment
shell: pwsh
run: |
$env:PATH="c:/vcruntime;$env:PATH"
echo "PATH=$env:PATH" >> $env:GITHUB_ENV
- name: Check vcruntime140
shell: pwsh
run: |
echo ((Get-Command vcruntime140.dll).Path)
echo ((Get-Command vcruntime140.dll).Version)
# To avoid git clone to mess with the line endings of GDAL autotest data
# files that look like text, but should be handled as binary content
- name: Set git core.autocrlf to false
Expand Down

0 comments on commit 9ff56b3

Please sign in to comment.