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.

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

Update to rtools43 in CI #2947

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
44 changes: 26 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Windows Rtools40
name: Windows Rtools43

on:
pull_request:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading