Skip to content

Commit beec9bc

Browse files
committed
Upped cwipc version.
Get macOS cwipc from built folder archiv.
1 parent 3921ad9 commit beec9bc

2 files changed

Lines changed: 21 additions & 26 deletions

File tree

tests/setup_test_environment.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use with "source", don't run normally.
33
# Installs cwipc, creates a venv in .venv, and installs the cwipc python modules.
44
# Adds ./installed/bin to PATH
5-
$cwipc_version_tag = "v8.0a1"
5+
$cwipc_version_tag = "v8.0a3"
66

77
If (Test-Path .\cwipc-built) {
88
Remove-Item .\cwipc-built -Recurse -Force

tests/setup_test_environment.sh

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
# Use with "source", don't run normally.
33
# Installs cwipc, creates a venv in .venv, and installs the cwipc python modules.
44
# Adds ./installed/bin to PATH
5-
cwipc_version_tag=v8.0a1
5+
cwipc_version_tag=v8.0a3
66
if [ $(uname) = "Linux" ]; then
77
sudo apt install -y python3.12-venv
88

99
curl -L -o cwipc-built.tar.gz https://github.com/cwi-dis/cwipc/releases/download/${cwipc_version_tag}/cwipc-ubuntu2404-amd64-built-${cwipc_version_tag}.tar.gz
1010
(cd installed && tar xfv ../cwipc-built.tar.gz)
1111

12-
export PATH=$(pwd)/installed/bin:$PATH
13-
export LD_LIBRARY_PATH=$(pwd)/installed/lib:$LD_LIBRARY_PATH
14-
export SIGNALS_SMD_PATH=$(pwd)/installed/lib/
15-
1612
bash installed/libexec/cwipc/scripts/install-3rdparty-ubuntu2404.sh
1713

1814
python3.12 -m venv .venv
1915
source .venv/bin/activate
2016
CWIPC_PYTHON=$(which python) cwipc_pymodules_install.sh || true
2117

22-
if [ "${GITHUB_ACTIONS:-false}" = true ]; then
23-
echo "$(pwd)/installed/bin" >> $GITHUB_PATH
24-
echo "LD_LIBRARY_PATH=$(pwd)/installed/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
25-
echo "SIGNALS_SMD_PATH=$(pwd)/installed/lib/" >> $GITHUB_ENV
26-
fi
27-
28-
elif [ $(uname) = "Darwin" ]; then
18+
elif [ $(uname) = "Darwin" ]; then
19+
brew install libomp
20+
brew link --force libomp
21+
mkdir -p installed
22+
curl -L -o cwipc-built.tar.gz https://github.com/cwi-dis/cwipc/releases/download/${cwipc_version_tag}/cwipc-macos-$(arch)-built-${cwipc_version_tag}.tar.gz
23+
(cd installed && tar xfv ../cwipc-built.tar.gz)
24+
25+
python3.12 -m venv .venv
26+
source .venv/bin/activate
27+
CWIPC_PYTHON=$(which python) cwipc_pymodules_install.sh || true
28+
elif false; then
2929
brew tap cwi-dis/cwipc
3030
# Workaround for git-lfs issue with brew install --head:
3131
GIT_LFS_WTD="$(git --exec-path)/git-lfs"
@@ -39,23 +39,18 @@ elif [ $(uname) = "Darwin" ]; then
3939
python3.12 -m venv .venv
4040
source .venv/bin/activate
4141
CWIPC_PYTHON=$(which python) cwipc_pymodules_install.sh || true
42-
export PATH=$(pwd)/installed/bin:$PATH
43-
export DYLD_LIBRARY_PATH=$(pwd)/installed/lib:$DYLD_LIBRARY_PATH
44-
export SIGNALS_SMD_PATH=$(pwd)/installed/lib/
45-
if [ "${GITHUB_ACTIONS:-false}" = true ]; then
46-
echo "$(pwd)/installed/bin" >> $GITHUB_PATH
47-
echo "DYLD_LIBRARY_PATH=$(pwd)/installed/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
48-
echo "SIGNALS_SMD_PATH=$(pwd)/installed/lib/" >> $GITHUB_ENV
49-
fi
5042
else
5143
echo "Unsupported OS"
5244
fi
5345

5446
if [ "${GITHUB_ACTIONS:-false}" = true ]; then
5547
# GitHub actions
5648
echo $(pwd)/installed/bin >> $GITHUB_PATH
57-
echo "DYLD_LIBRARY_PATH=$(pwd)/installed/lib" >> $GITHUB_ENV
58-
export PATH=$(pwd)/installed/bin:$PATH
59-
export LD_LIBRARY_PATH=$(pwd)/installed/lib:$LD_LIBRARY_PATH
60-
export SIGNALS_SMD_PATH=$(pwd)/installed/lib/
61-
fi
49+
echo "LD_LIBRARY_PATH=$(pwd)/installed/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
50+
echo "DYLD_LIBRARY_PATH=$(pwd)/installed/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
51+
echo "SIGNALS_SMD_PATH=$(pwd)/installed/lib/" >> $GITHUB_ENV
52+
fi
53+
export PATH=$(pwd)/installed/bin:$PATH
54+
export LD_LIBRARY_PATH=$(pwd)/installed/lib:$LD_LIBRARY_PATH
55+
export DYLD_LIBRARY_PATH=$(pwd)/installed/lib:$DYLD_LIBRARY_PATH
56+
export SIGNALS_SMD_PATH=$(pwd)/installed/lib/

0 commit comments

Comments
 (0)