Skip to content

Commit

Permalink
Switch from ::set-env to GH environment file
Browse files Browse the repository at this point in the history
  • Loading branch information
nightlark committed Apr 30, 2021
1 parent d01fcdc commit a59a99b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/setup-macos-10.9-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ tar -xf "MacOSX${SDK_VER}.sdk.tar.xz" -C "${XCODE_MACOS_SDK_PATH}"
/usr/libexec/PlistBuddy -c "Set :MinimumSDKVersion ${SDK_VER}" "${XCODE_MACOS_PLATFORM_PATH}/Info.plist"

# Set MACOSX_DEPLOYMENT_TARGET on GitHub Actions
echo "::set-env name=MACOSX_DEPLOYMENT_TARGET::${SDK_VER}"
echo "MACOSX_DEPLOYMENT_TARGET=${SDK_VER}" >> $GITHUB_ENV
2 changes: 1 addition & 1 deletion helics-pip/packaging_scripts/setup-Windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mkdir wheelhouse
# Set the CMAKE_PREFIX_PATH environment variable in GitHub Actions
CMAKE_PREFIX_PATH="${PWD}/helics"
export CMAKE_PREFIX_PATH
echo "::set-env name=CMAKE_PREFIX_PATH::${PWD}/helics"
echo "CMAKE_PREFIX_PATH=${PWD}/helics" >> $GITHUB_ENV

# Copy any patched files to the HELICS source tree if they exist
cp -r helics-pip/patches/${HELICS_VERSION}/* helics-pip/bundled/helics/ || true
4 changes: 2 additions & 2 deletions helics-pip/packaging_scripts/setup-macOS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ tar xzf Helics-*.tar.gz -C helics-pip/bundled/helics/ && rm Helics-*.tar.gz || e
# Set the CMAKE_PREFIX_PATH environment variable in GitHub Actions
CMAKE_PREFIX_PATH="${PWD}/helics"
export CMAKE_PREFIX_PATH
echo "::set-env name=CMAKE_PREFIX_PATH::${PWD}/helics"
echo "CMAKE_PREFIX_PATH=${PWD}/helics" >> $GITHUB_ENV

# Set the DYLD_LIBRARY_PATH in GitHub Actions so delocate can fix up the wheels
DYLD_LIBRARY_PATH="${PWD}/helics/lib:${PWD}/helics/lib64:$DYLD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH
echo "::set-env name=DYLD_LIBRARY_PATH::$PWD/helics/lib:$PWD/helics/lib64:$DYLD_LIBRARY_PATH"
echo "DYLD_LIBRARY_PATH=$PWD/helics/lib:$PWD/helics/lib64:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV

# Copy any patched files to the HELICS source tree if they exist
cp -r helics-pip/patches/${HELICS_VERSION}/* helics-pip/bundled/helics/ || true
2 changes: 1 addition & 1 deletion helics_apps-pip/packaging_scripts/setup-macOS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ pip install setuptools wheel
# Set the DYLD_LIBRARY_PATH in GitHub Actions so delocate can fix up the wheel
DYLD_LIBRARY_PATH="${PWD}/helics/lib:${PWD}/helics/lib64:$DYLD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH
echo "::set-env name=DYLD_LIBRARY_PATH::$PWD/helics/lib:$PWD/helics/lib64:$DYLD_LIBRARY_PATH"
echo "DYLD_LIBRARY_PATH=$PWD/helics/lib:$PWD/helics/lib64:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV

0 comments on commit a59a99b

Please sign in to comment.