mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-12-15 07:40:23 +08:00
Change osx refs to macos (#4707)
This commit is contained in:
Allen Byrne
GitHub
parent
9824e7f7e7
commit
d7e0ad5200
4
.github/workflows/cmake-bintest.yml
vendored
4
.github/workflows/cmake-bintest.yml
vendored
@ -161,7 +161,7 @@ jobs:
|
||||
- name: Get published binary (MacOS_latest)
|
||||
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
|
||||
with:
|
||||
name: tgz-osx-${{ inputs.build_mode }}-binary
|
||||
name: tgz-macos14_clang-${{ inputs.build_mode }}-binary
|
||||
path: ${{ github.workspace }}
|
||||
|
||||
- name: Uncompress hdf5 binary (MacOS_latest)
|
||||
@ -201,6 +201,6 @@ jobs:
|
||||
HDF5_PLUGIN_PATH: ${{ steps.set-hdf5lib-name.outputs.HDF5_PLUGIN_PATH }}
|
||||
run: |
|
||||
cd "${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/share/HDF5Examples"
|
||||
cmake --workflow --preset=ci-StdShar-OSX-Clang --fresh
|
||||
cmake --workflow --preset=ci-StdShar-MACOS-Clang --fresh
|
||||
shell: bash
|
||||
|
||||
|
||||
14
.github/workflows/cmake-ctest.yml
vendored
14
.github/workflows/cmake-ctest.yml
vendored
@ -358,7 +358,7 @@ jobs:
|
||||
id: run-ctest
|
||||
run: |
|
||||
cd "${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}"
|
||||
cmake --workflow --preset=${{ inputs.preset_name }}-OSX-Clang --fresh
|
||||
cmake --workflow --preset=${{ inputs.preset_name }}-MACOS-Clang --fresh
|
||||
shell: bash
|
||||
|
||||
- name: Publish binary (MacOS_latest)
|
||||
@ -371,7 +371,7 @@ jobs:
|
||||
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/README.md ${{ runner.workspace }}/build/hdf5
|
||||
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5
|
||||
cd "${{ runner.workspace }}/build"
|
||||
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-osx.tar.gz hdf5
|
||||
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz hdf5
|
||||
shell: bash
|
||||
|
||||
- name: Publish dmg binary (MacOS_latest)
|
||||
@ -384,7 +384,7 @@ jobs:
|
||||
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/README.md ${{ runner.workspace }}/builddmg/hdf5
|
||||
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/*.dmg ${{ runner.workspace }}/builddmg/hdf5
|
||||
cd "${{ runner.workspace }}/builddmg"
|
||||
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-osx.dmg.tar.gz hdf5
|
||||
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-macos14_clang.dmg.tar.gz hdf5
|
||||
shell: bash
|
||||
|
||||
- name: List files in the space (MacOS_latest)
|
||||
@ -396,15 +396,15 @@ jobs:
|
||||
- name: Save published binary (MacOS_latest)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: tgz-osx-binary
|
||||
path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-osx.tar.gz
|
||||
name: tgz-macos14_clang-binary
|
||||
path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
|
||||
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
|
||||
|
||||
- name: Save published dmg binary (MacOS_latest)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: tgz-osx-dmg-binary
|
||||
path: ${{ runner.workspace }}/builddmg/${{ steps.set-file-base.outputs.FILE_BASE }}-osx.dmg.tar.gz
|
||||
name: tgz-macos14_clang-dmg-binary
|
||||
path: ${{ runner.workspace }}/builddmg/${{ steps.set-file-base.outputs.FILE_BASE }}-macos14_clang.dmg.tar.gz
|
||||
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
|
||||
|
||||
build_and_test_S3_linux:
|
||||
|
||||
2
.github/workflows/daily-build.yml
vendored
2
.github/workflows/daily-build.yml
vendored
@ -64,7 +64,7 @@ jobs:
|
||||
if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
|
||||
|
||||
call-workflow-release:
|
||||
needs: [call-workflow-tarball, call-workflow-ctest, call-workflow-abi]
|
||||
needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi]
|
||||
permissions:
|
||||
contents: write # In order to allow tag creation
|
||||
uses: ./.github/workflows/release-files.yml
|
||||
|
||||
4
.github/workflows/main-cmake.yml
vendored
4
.github/workflows/main-cmake.yml
vendored
@ -266,7 +266,7 @@ jobs:
|
||||
- name: Save published binary (Mac_latest)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: tgz-osx-${{ inputs.build_mode }}-binary
|
||||
name: tgz-macos14_clang-${{ inputs.build_mode }}-binary
|
||||
path: ${{ runner.workspace }}/build/HDF5-*-Darwin.tar.gz
|
||||
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
|
||||
if: ${{ (matrix.os == 'macos-latest') && (inputs.thread_safety != 'TS') }}
|
||||
@ -274,7 +274,7 @@ jobs:
|
||||
- name: Save published dmg binary (Mac_latest)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: tgz-osx-${{ inputs.build_mode }}-dmg-binary
|
||||
name: tgz-macos14_clang-${{ inputs.build_mode }}-dmg-binary
|
||||
path: ${{ runner.workspace }}/build/HDF5-*-Darwin.dmg
|
||||
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
|
||||
if: ${{ (matrix.os == 'macos-latest') && (inputs.thread_safety != 'TS') }}
|
||||
|
||||
16
.github/workflows/release-files.yml
vendored
16
.github/workflows/release-files.yml
vendored
@ -109,13 +109,13 @@ jobs:
|
||||
- name: Get published binary (MacOS)
|
||||
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
|
||||
with:
|
||||
name: tgz-osx-binary
|
||||
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-dmg-binary
|
||||
name: tgz-macos14_clang-dmg-binary
|
||||
path: ${{ github.workspace }}
|
||||
|
||||
- name: Get published binary (Linux)
|
||||
@ -185,8 +185,8 @@ jobs:
|
||||
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen.zip > ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
|
||||
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 }}-osx.dmg.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.tar.gz >> ${{ 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.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
|
||||
sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
|
||||
@ -231,8 +231,8 @@ jobs:
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen.zip
|
||||
${{ 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 }}-osx.dmg.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz
|
||||
@ -260,8 +260,8 @@ jobs:
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}.zip
|
||||
hdf5.tar.gz
|
||||
hdf5.zip
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-osx.dmg.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz
|
||||
|
||||
4
.github/workflows/remove-files.yml
vendored
4
.github/workflows/remove-files.yml
vendored
@ -50,8 +50,8 @@ jobs:
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen.zip
|
||||
${{ 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 }}-osx.dmg.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-macos14_clang.dmg.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz
|
||||
${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz
|
||||
|
||||
@ -250,7 +250,7 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ci-StdShar-OSX-Clang",
|
||||
"name": "ci-StdShar-MACOS-Clang",
|
||||
"configurePreset": "ci-StdShar-Clang",
|
||||
"inherits": [
|
||||
"ci-x64-Release-Clang"
|
||||
@ -352,11 +352,11 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ci-StdShar-OSX-Clang",
|
||||
"name": "ci-StdShar-MACOS-Clang",
|
||||
"steps": [
|
||||
{"type": "configure", "name": "ci-StdShar-Clang"},
|
||||
{"type": "build", "name": "ci-StdShar-Clang"},
|
||||
{"type": "test", "name": "ci-StdShar-OSX-Clang"},
|
||||
{"type": "test", "name": "ci-StdShar-MACOS-Clang"},
|
||||
{"type": "package", "name": "ci-StdShar-Clang"}
|
||||
]
|
||||
},
|
||||
|
||||
@ -137,7 +137,7 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ci-StdShar-OSX-Clang",
|
||||
"name": "ci-StdShar-MACOS-Clang",
|
||||
"configurePreset": "ci-StdShar-Clang",
|
||||
"inherits": [
|
||||
"ci-x64-Release-Clang"
|
||||
@ -203,11 +203,11 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ci-StdShar-OSX-Clang",
|
||||
"name": "ci-StdShar-MACOS-Clang",
|
||||
"steps": [
|
||||
{"type": "configure", "name": "ci-StdShar-Clang"},
|
||||
{"type": "build", "name": "ci-StdShar-Clang"},
|
||||
{"type": "test", "name": "ci-StdShar-OSX-Clang"}
|
||||
{"type": "test", "name": "ci-StdShar-MACOS-Clang"}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@ -150,7 +150,7 @@ INSTALL_HDF5()
|
||||
install_file=./HDF5-${version}-Linux.sh
|
||||
$install_file --skip-license $*
|
||||
;;
|
||||
Darwin) # Mac OSX DMG file
|
||||
Darwin) # MacOS DMG file
|
||||
# These steps were a kludge. Need proper support from Cmake engineering.
|
||||
echo Darwin install step needs proper implementation. Quit.
|
||||
return 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user