From 4e4490de531e2c54df3b8f3b481009601e3f63d2 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 20 Sep 2023 09:34:33 +0300 Subject: [PATCH] Update to rtools43 in CI --- .github/workflows/main.yml | 44 ++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 958d5406fb1..e2df959a611 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: Windows Rtools40 +name: Windows Rtools43 on: pull_request: @@ -30,15 +30,15 @@ jobs: python-version: '3.x' - uses: r-lib/actions/setup-r@v2 with: - r-version: 4.1.3 + r-version: 4.3.1 - - name: Set path for Rtools40 + - name: Set path for Rtools43 if: runner.os == 'Windows' - run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + run: echo "C:/rtools43/usr/bin;C:/rtools43/ucrt64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Install mingw32-make and check toolchain path if: runner.os == 'Windows' run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm + pacman -Syu mingw-w64-ucrt-x86_64-make mingw-w64-ucrt-x86_64-gcc --noconfirm g++ --version Get-Command g++ | Select-Object -ExpandProperty Definition mingw32-make --version @@ -49,6 +49,8 @@ jobs: shell: powershell run: | Add-Content make\local "O=1`n" + Add-Content make\local "CXXFLAGS += -Wno-nonnull -D_UCRT`n" + Add-Content make\local "TBB_CXXFLAGS= -D_UCRT`n" mingw32-make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell @@ -80,15 +82,15 @@ jobs: python-version: '3.x' - uses: r-lib/actions/setup-r@v2 with: - r-version: 4.1.3 + r-version: 4.3.1 - - name: Set path for Rtools40 + - name: Set path for Rtools43 if: runner.os == 'Windows' - run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + run: echo "C:/rtools43/usr/bin;C:/rtools43/ucrt64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Install mingw32-make and check toolchain path if: runner.os == 'Windows' run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm + pacman -Syu mingw-w64-ucrt-x86_64-make mingw-w64-ucrt-x86_64-gcc --noconfirm g++ --version Get-Command g++ | Select-Object -ExpandProperty Definition mingw32-make --version @@ -99,6 +101,8 @@ jobs: shell: powershell run: | Add-Content make\local "O=1`n" + Add-Content make\local "CXXFLAGS += -Wno-nonnull -D_UCRT`n" + Add-Content make\local "TBB_CXXFLAGS= -D_UCRT`n" mingw32-make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell @@ -134,15 +138,15 @@ jobs: python-version: '3.x' - uses: r-lib/actions/setup-r@v2 with: - r-version: 4.1.3 + r-version: 4.3.1 - - name: Set path for Rtools40 + - name: Set path for Rtools43 if: runner.os == 'Windows' - run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + run: echo "C:/rtools43/usr/bin;C:/rtools43/ucrt64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Install mingw32-make and check toolchain path if: runner.os == 'Windows' run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm + pacman -Syu mingw-w64-ucrt-x86_64-make mingw-w64-ucrt-x86_64-gcc --noconfirm g++ --version Get-Command g++ | Select-Object -ExpandProperty Definition mingw32-make --version @@ -153,6 +157,8 @@ jobs: shell: powershell run: | Add-Content make\local "O=1`n" + Add-Content make\local "CXXFLAGS += -Wno-nonnull -D_UCRT`n" + Add-Content make\local "TBB_CXXFLAGS= -D_UCRT`n" mingw32-make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell @@ -171,7 +177,7 @@ jobs: with: name: gtest_outputs_xml path: '**/*_test.xml' - + mix-fun-2: name: mix/fun tests 2 runs-on: windows-latest @@ -183,15 +189,15 @@ jobs: python-version: '3.x' - uses: r-lib/actions/setup-r@v2 with: - r-version: 4.1.3 + r-version: 4.3.1 - - name: Set path for Rtools40 + - name: Set path for Rtools43 if: runner.os == 'Windows' - run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + run: echo "C:/rtools43/usr/bin;C:/rtools43/ucrt64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Install mingw32-make and check toolchain path if: runner.os == 'Windows' run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm + pacman -Syu mingw-w64-ucrt-x86_64-make mingw-w64-ucrt-x86_64-gcc --noconfirm g++ --version Get-Command g++ | Select-Object -ExpandProperty Definition mingw32-make --version @@ -202,6 +208,8 @@ jobs: shell: powershell run: | Add-Content make\local "O=1`n" + Add-Content make\local "CXXFLAGS += -Wno-nonnull -D_UCRT`n" + Add-Content make\local "TBB_CXXFLAGS= -D_UCRT`n" mingw32-make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell