Skip to content

Commit

Permalink
change quoting and reporting of library install paths
Browse files Browse the repository at this point in the history
  • Loading branch information
terhorstd committed Jan 30, 2025
1 parent efdf4c8 commit 6f937eb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/nestbuildmatrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ jobs:
CMAKE_C_COMPILER_LAUNCHER: ccache
CMAKE_CXX_COMPILER_LAUNCHER: ccache
run: |
mkdir -p "$NEST_VPATH/reports" "$NEST_RESULT"
mkdir -pv "$NEST_VPATH/reports" "$NEST_RESULT"
if [ "$xNEST_BUILD_COMPILER" = "CLANG" ]; then
export CC=clang-11
Expand All @@ -733,9 +733,9 @@ jobs:
-Dwith-ltdl=${{ contains(matrix.use, 'ltdl') && 'ON' || 'OFF' }} \
-Dwith-readline=${{ contains(matrix.use, 'readline') && 'ON' || 'OFF' }} \
-Dwith-hdf5=${{ contains(matrix.use, 'hdf5') && 'ON' || 'OFF' }} \
-Dwith-sionlib=${{ contains(matrix.use, 'sionlib') && '$HOME/.cache/sionlib.install' || 'OFF' }} \
-Dwith-libneurosim=${{ contains(matrix.use, 'libneurosim') && '$HOME/.cache/libneurosim.install' || 'OFF' }} \
-Dwith-music=${{ contains(matrix.use, 'music') && '$HOME/.cache/music.install' || 'OFF' }} \
-Dwith-sionlib=${{ contains(matrix.use, 'sionlib') && "{$HOME}/.cache/sionlib.install" || 'OFF' }} \
-Dwith-libneurosim=${{ contains(matrix.use, 'libneurosim') && "${HOME}/.cache/libneurosim.install" || 'OFF' }} \
-Dwith-music=${{ contains(matrix.use, 'music') && "${HOME}/.cache/music.install" || 'OFF' }} \
..
- name: "Add GCC problem matcher"
Expand All @@ -760,7 +760,7 @@ jobs:
- name: "Initialize Matplotlibrc"
run: |
# initialize matplotlib backend
mkdir -p $HOME/.matplotlib
mkdir -pv $HOME/.matplotlib
echo "backend : svg" > $HOME/.matplotlib/matplotlibrc
- name: "Run NEST testsuite"
Expand Down Expand Up @@ -846,7 +846,7 @@ jobs:
- name: "Configure NEST build"
run: |
mkdir -p "$NEST_VPATH/reports" "$NEST_RESULT"
mkdir -pv "$NEST_VPATH/reports" "$NEST_RESULT"
cd "$NEST_VPATH"
cmake \
Expand Down Expand Up @@ -890,7 +890,7 @@ jobs:
- name: "Initialize Matplotlibrc"
run: |
# initialize matplotlib backend
mkdir -p $HOME/.matplotlib
mkdir -pv $HOME/.matplotlib
echo "backend : svg" > $HOME/.matplotlib/matplotlibrc
- name: "Run NEST testsuite"
Expand Down
2 changes: 1 addition & 1 deletion build_support/install_sionlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail

SIONLIBVERSION="1.7.4"
SIONLIB_INSTALL_PATH="${1:-${HOME}/.cache/csa.install}"
SIONLIB_INSTALL_PATH="${1:-${HOME}/.cache/sionlib.install}"

# Install SIONlib
wget --content-disposition "http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${SIONLIBVERSION}"
Expand Down
2 changes: 1 addition & 1 deletion examples/nest/Potjans_2014/run_microcircuit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ OUTPUT_PATH="$(cd "$OUTPUT_PATH" || exit 1; pwd)"
NEST_PATH="$(grep '/nest_path' sim_params.sli | cut -d '(' -f2 | cut -d ')' -f1)"

# Prepare output directory
mkdir -p "$OUTPUT_PATH"
mkdir -pv "$OUTPUT_PATH"
cp 'sim_params.sli' "$OUTPUT_PATH"
cp 'network_params.sli' "$OUTPUT_PATH"
cp 'microcircuit.sli' "$OUTPUT_PATH"
Expand Down
2 changes: 1 addition & 1 deletion examples/run_examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ for i in "${EXAMPLES[@]}"; do
output_dir="$basedir/example_logs/$example"
logfile="$output_dir/output.log"
metafile="$output_dir/meta.yaml"
mkdir -p "$output_dir"
mkdir -pv "$output_dir"

echo ">>> RUNNING: $workdir/$example"
echo " LOGFILE: $logfile"
Expand Down

0 comments on commit 6f937eb

Please sign in to comment.