Skip to content

Commit

Permalink
Lost a file change from 41ec0b2 due to cherry-pick order.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nrnhines
nrnhines committed Dec 16, 2020
1 parent 45bf522 commit 09b151e
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions packaging/python/fix_demo_libnrnmech.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@ set -ex

# On Mac, update neurondemo libnrnmech to point to relative libnrniv.
# neurondemo dlopens ..../release/x86_64/.libs/libnrnmech.so
# Remove the libnrnmech.so symbolic link.
# Copy ..../release/x86_64/libnrnmech.dylib to ...../lib/libnrnmech.so
# Remove the libnrnmech.so if it is a symbolic link
# and copy ..../release/x86_64/libnrnmech.dylib to ...../lib/libnrnmech.so
# Rewrite @rpath/libnrniv.dylib to @loader_path/...../lib/libnrniv.dylib

instdir=$1
REL_RPATH=$2
libnrnmech_dir=$instdir/share/nrn/demo/release/x86_64

if test "`uname -s`" = "Darwin" ; then
if test ! -h "$libnrnmech_dir/.libs/libnrnmech.so" ; then
echo "$libnrnmech_dir/.libs/libnrnmech.so is not a symbolic link"
exit 1
if test -h "$libnrnmech_dir/.libs/libnrnmech.so" ; then
rm -f $libnrnmech_dir/.libs/libnrnmech.so
mv $libnrnmech_dir/libnrnmech.dylib $libnrnmech_dir/.libs/libnrnmech.so
fi
rm -f $libnrnmech_dir/.libs/libnrnmech.so
mv $libnrnmech_dir/libnrnmech.dylib $libnrnmech_dir/.libs/libnrnmech.so
install_name_tool -change '@rpath/libnrniv.dylib' \
'@loader_path/../../../../../../lib/libnrniv.dylib' \
$libnrnmech_dir/.libs/libnrnmech.so
Expand Down

6 comments on commit 09b151e

@nrnhines
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexsavulescu I think you have seen this before?

Failed:      
Incomplete:  hh_morph
---
Ran 50 tests:
Passed:     49
Failed:     0
Incomplete: 1
Error: Process completed with exit code 255.

But it seems strange to me as the pull request passed before merge to release/7.8 (and that pull request started from release/7.8).

@alexsavulescu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, see my last comment here: #863
I will re-run the workflow.

@alexsavulescu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/neuronsimulator/nrn/actions/runs/426654566

@alexsavulescu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All green around this time. It looks like running with CMake that error pops up systematically.

@nrnhines
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I see that all the jobs got a green check but it is confusing that three macOS-10.15-autotools jobs say ...

Process completed with exit code 255.
The job running on runner GitHub Actions 3 has exceeded the maximum execution time of 30 minutes.
The operation was canceled.

@alexsavulescu
Copy link
Member

@alexsavulescu alexsavulescu commented on 09b151e Dec 17, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I see that all the jobs got a green check but it is confusing that three macOS-10.15-autotools jobs say ...

Process completed with exit code 255.
The job running on runner GitHub Actions 3 has exceeded the maximum execution time of 30 minutes.
The operation was canceled.

Those were previous runs, not very fortunate how GitHub actions show errors.

Please sign in to comment.