Skip to content

Mac disabled r #80

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

Merged
mj-xmr merged 3 commits into from
Aug 19, 2022
Merged

Mac disabled r #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87b7288
Update build.yml
mj-xmr Aug 19, 2022
800edb8
R fix
mj-xmr Aug 19, 2022
87efbdf
R fix 2
mj-xmr Aug 19, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ jobs:
- name: build & install the unmanaged dependencies
run: util/deps-build.sh
- name: build
run: ./ci-default --unity --lto --build-r
run: ./ci-default --unity --lto
- name: run demo
run: ./ci-default --unity --lto --build-r --run-demo
run: ./ci-default --unity --lto --run-demo
- uses: actions/upload-artifact@v2
with:
name: tsqsim-${{ matrix.os }}
Expand Down
3 changes: 2 additions & 1 deletion util/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ def get_r_path(search_dir = '.'):
if os.path.isdir(dir_osx11):
dir_framework = dir_osx11
if not os.path.isdir(dir_framework):
raise IOError("The R Framework's dir: {} wasn't found".format(dir_framework))
if args.build_r: # Don't panic, if R wasn't selected
raise IOError("The R Framework's dir: {} wasn't found".format(dir_framework))
exports_r = "&& export R_HOME={} && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$R_HOME/lib".format(dir_framework)
os.chdir(prev_dir)

Expand Down