Skip to content

Commit

Permalink
Update to latest dev changes
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF committed Sep 13, 2024
1 parent 7c424b6 commit dbfb072
Show file tree
Hide file tree
Showing 463 changed files with 2,549 additions and 674 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @lrknox @byrnHDF
* @lrknox @byrnHDF @derobins @fortnern @jhendersonHDF @bmribler @glennsong09 @mattjala @brtnfld

# Order is important. The last matching pattern has the most precedence.
# So if a pull request only touches javascript files, only these owners
Expand Down
325 changes: 275 additions & 50 deletions .github/workflows/cmake-ctest.yml

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: hdf5 plugins daily build

# Triggers the workflow on a pull request or on demand
on:
workflow_dispatch:
inputs:
Expand All @@ -14,8 +15,6 @@ on:
permissions:
contents: read

# A workflow run is made up of one or more jobs that can run sequentially or
# in parallel.
jobs:
get-old-names:
runs-on: ubuntu-latest
Expand All @@ -25,7 +24,7 @@ jobs:
run-ignore: ${{ steps.getinputs.outputs.INPUTS_IGNORE }}

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.1.7

- name: Get hdf5 release base name
uses: dsaltares/fetch-gh-release-asset@master
Expand Down Expand Up @@ -76,6 +75,16 @@ jobs:
use_hdf: ${{ needs.get-old-names.outputs.hdf5-name }}
# use_tag: snapshot-1.14
use_environ: snapshots
secrets:
APPLE_CERTS_BASE64: ${{ secrets.APPLE_CERTS_BASE64 }}
APPLE_CERTS_BASE64_PASSWD: ${{ secrets.APPLE_CERTS_BASE64_PASSWD }}
KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}

call-workflow-release:
Expand Down
63 changes: 50 additions & 13 deletions .github/workflows/release-files.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hdf5 plugins release-files

# Controls when the action will run. Triggers the workflow on a schedule
# Triggers the workflow on a call from another workflow
on:
workflow_call:
inputs:
Expand Down Expand Up @@ -40,9 +40,10 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Get Sources
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
with:
fetch-depth: 0
ref: '${{ github.head_ref || github.ref_name }}'

- name: Get Commit
if: ${{ (inputs.use_environ == 'snapshots') }}
Expand Down Expand Up @@ -77,43 +78,71 @@ jobs:
# Get files created by tarball script
- name: Get tgz-tarball (Linux)
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: tgz-tarball
path: ${{ github.workspace }}

- name: Get zip-tarball (Windows)
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: zip-tarball
path: ${{ github.workspace }}

# Get files created by cmake-ctest script
- name: Get published binary (Windows)
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: zip-vs2022_cl-binary
path: ${{ github.workspace }}

- name: Get published msi binary (Windows)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: msi-vs2022_cl-binary
path: ${{ github.workspace }}

- name: Get published binary (MacOS)
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: tgz-macos14_clang-binary
path: ${{ github.workspace }}

- name: Get published dmg binary (MacOS)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: tgz-osx-binary
name: tgz-macos14_clang-dmg-binary
path: ${{ github.workspace }}

- name: Get published binary (Linux)
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: tgz-ubuntu-2204_gcc-binary
path: ${{ github.workspace }}

- name: Get published deb binary (Linux)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: deb-ubuntu-2204_gcc-binary
path: ${{ github.workspace }}

- name: Get published rpm binary (Linux)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: rpm-ubuntu-2204_gcc-binary
path: ${{ github.workspace }}

- name: Create sha256 sums for files
run: |
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.zip >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
- name: Store snapshot name
run: |
Expand All @@ -122,33 +151,41 @@ jobs:
- name: PreRelease tag
id: create_prerelease
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # v2.0.4
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
with:
tag_name: "${{ inputs.use_tag }}"
prerelease: true
files: |
last-file.txt
${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
- name: Release tag
id: create_release
if: ${{ (inputs.use_environ == 'release') }}
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # v2.0.4
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
with:
tag_name: "${{ inputs.use_tag }}"
prerelease: false
files: |
${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: hdf5 plugins release build

# Triggers the workflow on demand
on:
workflow_dispatch:
inputs:
Expand All @@ -17,8 +18,6 @@ on:
permissions:
contents: read

# A workflow run is made up of one or more jobs that can run sequentially or
# in parallel.
jobs:
log-the-inputs:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -51,6 +50,16 @@ jobs:
use_hdf: ${{ needs.log-the-inputs.outputs.hdf_tag }}
snap_name: hdf5_plugins-${{ needs.call-workflow-tarball.outputs.source_base }}
use_environ: release
secrets:
APPLE_CERTS_BASE64: ${{ secrets.APPLE_CERTS_BASE64 }}
APPLE_CERTS_BASE64_PASSWD: ${{ secrets.APPLE_CERTS_BASE64_PASSWD }}
KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}

call-workflow-release:
needs: [log-the-inputs, call-workflow-tarball, call-workflow-ctest]
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/remove-files.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hdf5 plugins remove-files

# Controls when the action will run. Triggers the workflow on a schedule
# Triggers the workflow on a call from another workflow
on:
workflow_call:
inputs:
Expand Down Expand Up @@ -47,8 +47,12 @@ jobs:
assets: |
${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
${{ steps.get-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
7 changes: 3 additions & 4 deletions .github/workflows/tarball.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hdf5 plugins tarball

# Controls when the action will run. Triggers the workflow on a schedule
# Triggers the workflow on a call from another workflow
on:
workflow_call:
inputs:
Expand Down Expand Up @@ -34,8 +34,6 @@ on:
permissions:
contents: read

# A workflow run is made up of one or more jobs that can run sequentially or
# in parallel
jobs:
check_commits:
name: Check for recent commits
Expand Down Expand Up @@ -87,9 +85,10 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Get Sources
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.7
with:
path: hdfsrc
ref: '${{needs.check_commits.outputs.branch_ref }}'

- name: Retrieve version
id: version
Expand Down
44 changes: 19 additions & 25 deletions BLOSC/config/cmake/H5BLOSCMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,19 @@ macro (EXTERNAL_BLOSC_LIBRARY compress_type)
URL_HASH ""
)
endif ()
FetchContent_GetProperties(BLOSC)
if(NOT blosc_POPULATED)
FetchContent_Populate(BLOSC)
set (BUILD_SHARED OFF CACHE BOOL "" FORCE)
set (BUILD_TESTS OFF CACHE BOOL "" FORCE)
set (BUILD_FUZZERS OFF CACHE BOOL "" FORCE)
set (BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
set (PREFER_EXTERNAL_SNAPPY OFF CACHE BOOL "" FORCE)
set (PREFER_EXTERNAL_ZLIB OFF CACHE BOOL "" FORCE)
set (PREFER_EXTERNAL_ZSTD OFF CACHE BOOL "" FORCE)
set (DEACTIVATE_SNAPPY ON CACHE BOOL "" FORCE)
set (BLOSC_IS_SUBPROJECT ON CACHE BOOL "" FORCE)
set (BLOSC_INSTALL OFF CACHE BOOL "" FORCE)

add_subdirectory(${blosc_SOURCE_DIR} ${blosc_BINARY_DIR})
endif()
set (BUILD_SHARED OFF CACHE BOOL "" FORCE)
set (BUILD_TESTS OFF CACHE BOOL "" FORCE)
set (BUILD_FUZZERS OFF CACHE BOOL "" FORCE)
set (BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
set (PREFER_EXTERNAL_SNAPPY OFF CACHE BOOL "" FORCE)
set (PREFER_EXTERNAL_ZLIB OFF CACHE BOOL "" FORCE)
set (PREFER_EXTERNAL_ZSTD OFF CACHE BOOL "" FORCE)
set (DEACTIVATE_SNAPPY ON CACHE BOOL "" FORCE)
set (BLOSC_IS_SUBPROJECT ON CACHE BOOL "" FORCE)
set (BLOSC_INSTALL OFF CACHE BOOL "" FORCE)

FetchContent_MakeAvailable(BLOSC)

##include (${BINARY_DIR}/${BLOSC_PACKAGE_NAME}${H5BLOSC_PACKAGE_EXT}-targets.cmake)
set (BLOSC_STATIC_LIBRARY "blosc_static")
Expand Down Expand Up @@ -69,23 +66,20 @@ macro (EXTERNAL_BLOSC_ZLIB_LIBRARY compress_type)
FetchContent_Declare (BLOSC_ZLIB
GIT_REPOSITORY ${BLOSC_ZLIB_URL}
GIT_TAG ${BLOSC_ZLIB_BRANCH}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${H5BLOSC_SOURCE_DIR}/config/zlib-CMakeLists.txt
<SOURCE_DIR>/CMakeLists.txt
)
elseif (${compress_type} MATCHES "TGZ")
FetchContent_Declare (BLOSC_ZLIB
URL ${BLOSC_ZLIB_URL}
URL_HASH ""
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${H5BLOSC_SOURCE_DIR}/config/zlib-CMakeLists.txt
<SOURCE_DIR>/CMakeLists.txt
)
endif ()
FetchContent_GetProperties(BLOSC_ZLIB)
if(NOT blosc_zlib_POPULATED)
FetchContent_Populate(BLOSC_ZLIB)

# Copy an additional/replacement files into the populated source
file(COPY ${H5BLOSC_SOURCE_DIR}/config/zlib-CMakeLists.txt DESTINATION ${blosc_zlib_SOURCE_DIR})
file(RENAME ${blosc_zlib_SOURCE_DIR}/zlib-CMakeLists.txt ${blosc_zlib_SOURCE_DIR}/CMakeLists.txt)

add_subdirectory(${blosc_zlib_SOURCE_DIR} ${blosc_zlib_BINARY_DIR})
endif()
FetchContent_MakeAvailable(BLOSC_ZLIB)

set (BLOSC_ZLIB_STATIC_LIBRARY "zlibstat")
set (BLOSC_ZLIB_LIBRARY ${BLOSC_ZLIB_STATIC_LIBRARY})
Expand Down
9 changes: 7 additions & 2 deletions BLOSC/config/cmake/HDFMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ macro (PLUGIN_README_PROPERTIES pkg_name)
if (WIN32)
set (BINARY_EXAMPLE_ENDING "zip")
set (BINARY_INSTALL_ENDING "msi")
set (BINARY_COMPRESS_ENDING "zip")
if (CMAKE_CL_64)
set (BINARY_SYSTEM_NAME "win64")
else ()
Expand Down Expand Up @@ -343,21 +344,25 @@ macro (PLUGIN_README_PROPERTIES pkg_name)
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2019")
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.3.*")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2022")
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.4.*")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2022")
else ()
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ???")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ????")
endif ()
else ()
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
endif ()
endif ()
elseif (APPLE)
set (BINARY_EXAMPLE_ENDING "tar.gz")
set (BINARY_COMPRESS_ENDING "tar.gz")
set (BINARY_INSTALL_ENDING "sh") # if packaging changes - use dmg
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
else ()
set (BINARY_EXAMPLE_ENDING "tar.gz")
set (BINARY_INSTALL_ENDING "sh")
set (BINARY_COMPRESS_ENDING "tar.gz")
set (BINARY_INSTALL_ENDING "sh/deb/rpm")
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
endif ()
Expand Down
Loading

0 comments on commit dbfb072

Please sign in to comment.