Skip to content

Commit

Permalink
Cleanup errors detected during merge compare (#4827)
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF authored Sep 13, 2024
1 parent 6313814 commit 1e9a8ef
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake-ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ jobs:
id: publish-ctest-deb-binary
run: |
mkdir "${{ runner.workspace }}/builddeb"
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC/*.deb ${{ runner.workspace }}/builddeb/${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
cp ${{ runner.workspace }}/hdf5/build114/${{ inputs.preset_name }}-GNUC/*.deb ${{ runner.workspace }}/builddeb/hdf5
shell: bash

- name: Publish rpm binary (Linux)
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/CPack.Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<string>????</string>
<!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<string>public.app-category.developer-tools</string>
<key>CFBundleVersion</key>
<string>@CPACK_PACKAGE_VERSION@</string>
<key>CFBundleShortVersionString</key>
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/FindHDFS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# HDFS_FOUND, whether HDFS is found.

execute_process(COMMAND $ENV{HADOOP_HOME}/bin/hadoop version OUTPUT_VARIABLE Hadoop_VERSION
RESULT_VARIABLE_VALUE Hadoop_RETURN)
RESULT_VARIABLE Hadoop_RETURN)

# currently only looking in HADOOP_HOME
find_path(HDFS_INCLUDE_DIR hdfs.h PATHS
Expand Down
2 changes: 1 addition & 1 deletion release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The official HDF5 releases can be obtained from:
Changes from Release to Release and New Features in the HDF5-1.16.x release series
can be found at:

https://support.hdfgroup.org/releases/hdf5/documentation/release_specific_info.html
https://support.hdfgroup.org/releases/hdf5/documentation/release_specific_info.md

If you have any questions or comments, please send them to the HDF Help Desk:

Expand Down

0 comments on commit 1e9a8ef

Please sign in to comment.