Skip to content

Update GHA tests to run using RTools44 #3060

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

Merged
merged 6 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
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
33 changes: 17 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Windows Rtools40
name: Windows Rtools44

on:
pull_request:
Expand Down Expand Up @@ -30,16 +30,16 @@ jobs:
python-version: '3.x'
- uses: r-lib/actions/setup-r@v2
with:
r-version: 4.1.3
r-version: 'release'
rtools-version: '44'

- name: Set path for Rtools40
- name: Set path for Rtools44
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:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

- name: Build Math libs
shell: powershell
run: |
Add-Content make\local "O=1`n"
make -f make/standalone math-libs -j2
- name: Add TBB to PATH
shell: powershell
Expand Down Expand Up @@ -71,16 +71,16 @@ jobs:
python-version: '3.x'
- uses: r-lib/actions/setup-r@v2
with:
r-version: 4.1.3
r-version: 'release'
rtools-version: '44'

- name: Set path for Rtools40
- name: Set path for Rtools44
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:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

- name: Build Math libs
shell: powershell
run: |
Add-Content make\local "O=1`n"
make -f make/standalone math-libs -j2
- name: Add TBB to PATH
shell: powershell
Expand Down Expand Up @@ -116,16 +116,16 @@ jobs:
python-version: '3.x'
- uses: r-lib/actions/setup-r@v2
with:
r-version: 4.1.3
r-version: 'release'
rtools-version: '44'

- name: Set path for Rtools40
- name: Set path for Rtools44
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:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

- name: Build Math libs
shell: powershell
run: |
Add-Content make\local "O=1`n"
make -f make/standalone math-libs -j2
- name: Add TBB to PATH
shell: powershell
Expand Down Expand Up @@ -156,11 +156,12 @@ jobs:
python-version: '3.x'
- uses: r-lib/actions/setup-r@v2
with:
r-version: 4.1.3
r-version: 'release'
rtools-version: '44'

- name: Set path for Rtools40
- name: Set path for Rtools44
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:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

- name: Build Math libs
shell: powershell
Expand Down
1 change: 1 addition & 0 deletions make/compiler_flags
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ ifeq ($(OS),Windows_NT)
CXXFLAGS_WARNINGS ?= -Wall -Wno-unused-function -Wno-uninitialized -Wno-unused-but-set-variable -Wno-unused-variable -Wno-sign-compare -Wno-unused-local-typedefs -Wno-int-in-bool-context -Wno-attributes
CPPFLAGS_GTEST ?= -DGTEST_HAS_PTHREAD=0
CPPFLAGS_OS ?= -D_USE_MATH_DEFINES
CPPFLAGS_OS += -D_GLIBCXX11_USE_C99_COMPLEX
## Detecting Process Bitness:
## http://blogs.msdn.com/b/david.wang/archive/2006/03/26/howto-detect-process-bitness.aspx
ifeq ($(PROCESSOR_ARCHITECTURE)$(PROCESSOR_ARCHITEW6432),x86)
Expand Down