From 92e7bca6ad5be34208d5ff99f026f751fa96918d Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 21 Jun 2024 10:40:01 -0500 Subject: [PATCH 1/4] Update abi report workflow to handle 1.14.4.3 release --- .github/workflows/abi-report.yml | 12 +++++++----- .github/workflows/daily-build.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/abi-report.yml b/.github/workflows/abi-report.yml index b2a20fb6891..f4005c91c2a 100644 --- a/.github/workflows/abi-report.yml +++ b/.github/workflows/abi-report.yml @@ -40,8 +40,10 @@ jobs: - name: Convert hdf5 reference name (Linux) id: convert-hdf5lib-refname run: | - FILE_DOTS=$(echo "${{ inputs.file_ref }}" | sed -r "s/([0-9]+)\_([0-9]+)\_([0-9]+).*/\1\.\2\.\3/") + FILE_DOTS=$(echo "${{ inputs.file_ref }}" | sed -r "s/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+).*/\1\.\2\.\3-\4/") echo "HDF5R_DOTS=$FILE_DOTS" >> $GITHUB_OUTPUT + FILE_DOTSMAIN=$(echo "${{ inputs.file_ref }}" | sed -r "s/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1\.\2\.\3/") + echo "HDF5R_DOTSMAIN=$FILE_DOTSMAIN" >> $GITHUB_OUTPUT - uses: actions/checkout@v4.1.1 @@ -81,8 +83,8 @@ jobs: run: | mkdir "${{ github.workspace }}/hdf5R" cd "${{ github.workspace }}/hdf5R" - wget -q https://github.com/HDFGroup/hdf5/releases/download/hdf5-${{ inputs.file_ref }}/hdf5-${{ inputs.file_ref }}-ubuntu-2204.tar.gz - tar zxf hdf5-${{ inputs.file_ref }}-ubuntu-2204_gcc.tar.gz + wget -q https://github.com/HDFGroup/hdf5/releases/download/hdf5-${{ inputs.file_ref }}/hdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}-ubuntu-2204_gcc.tar.gz + tar zxf hdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}-ubuntu-2204_gcc.tar.gz - name: List files for the space (Linux) run: | @@ -91,7 +93,7 @@ jobs: - name: Uncompress hdf5 reference binary (Linux) run: | cd "${{ github.workspace }}/hdf5R" - tar -zxvf ${{ github.workspace }}/hdf5R/hdf5/HDF5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}-Linux.tar.gz --strip-components 1 + tar -zxvf ${{ github.workspace }}/hdf5R/hdf5/HDF5-${{ inputs.file_ref }}-Linux.tar.gz --strip-components 1 - name: List files for the HDFR space (Linux) run: | @@ -113,7 +115,7 @@ jobs: - name: Run Java API report run: | - japi-compliance-checker ${{ steps.set-hdf5lib-refname.outputs.HDF5R_ROOT }}/lib/jarhdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}.jar ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/lib/jarhdf5-${{ steps.set-hdf5lib-name.outputs.HDF5_VERS }}.jar + japi-compliance-checker ${{ steps.set-hdf5lib-refname.outputs.HDF5R_ROOT }}/lib/jarhdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS_MAIN }}.jar ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/lib/jarhdf5-${{ steps.set-hdf5lib-name.outputs.HDF5_VERS }}.jar - name: Run ABI report run: | diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index fac360e7884..6ce18f2f4e7 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -52,7 +52,7 @@ jobs: needs: [call-workflow-tarball, call-workflow-ctest] uses: ./.github/workflows/abi-report.yml with: - file_ref: '1_14_3' + file_ref: '1.14.4.3' file_base: ${{ needs.call-workflow-tarball.outputs.file_base }} use_tag: snapshot use_environ: snapshots From 586afc473d31f96809535983113c3bd3ca65eb1a Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 21 Jun 2024 11:24:56 -0500 Subject: [PATCH 2/4] Correct tag name --- .github/workflows/abi-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abi-report.yml b/.github/workflows/abi-report.yml index f4005c91c2a..477df6959a7 100644 --- a/.github/workflows/abi-report.yml +++ b/.github/workflows/abi-report.yml @@ -83,7 +83,7 @@ jobs: run: | mkdir "${{ github.workspace }}/hdf5R" cd "${{ github.workspace }}/hdf5R" - wget -q https://github.com/HDFGroup/hdf5/releases/download/hdf5-${{ inputs.file_ref }}/hdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}-ubuntu-2204_gcc.tar.gz + wget -q https://github.com/HDFGroup/hdf5/releases/download/hdf5_${{ inputs.file_ref }}/hdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}-ubuntu-2204_gcc.tar.gz tar zxf hdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS }}-ubuntu-2204_gcc.tar.gz - name: List files for the space (Linux) From 9e22cf66102e8b5daaf16cb03fcfb4c38bdbcb4a Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 21 Jun 2024 13:10:10 -0500 Subject: [PATCH 3/4] Correct name of var --- .github/workflows/abi-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abi-report.yml b/.github/workflows/abi-report.yml index 477df6959a7..46525806d4a 100644 --- a/.github/workflows/abi-report.yml +++ b/.github/workflows/abi-report.yml @@ -115,7 +115,7 @@ jobs: - name: Run Java API report run: | - japi-compliance-checker ${{ steps.set-hdf5lib-refname.outputs.HDF5R_ROOT }}/lib/jarhdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTS_MAIN }}.jar ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/lib/jarhdf5-${{ steps.set-hdf5lib-name.outputs.HDF5_VERS }}.jar + japi-compliance-checker ${{ steps.set-hdf5lib-refname.outputs.HDF5R_ROOT }}/lib/jarhdf5-${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTSMAIN }}.jar ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/lib/jarhdf5-${{ steps.set-hdf5lib-name.outputs.HDF5_VERS }}.jar - name: Run ABI report run: | From 92232d8e9dc10151191770924eb7bdf93a8b3301 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 21 Jun 2024 14:13:39 -0500 Subject: [PATCH 4/4] Update name of java report --- .github/workflows/abi-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abi-report.yml b/.github/workflows/abi-report.yml index 46525806d4a..f0477002d3b 100644 --- a/.github/workflows/abi-report.yml +++ b/.github/workflows/abi-report.yml @@ -147,7 +147,7 @@ jobs: - name: Copy ABI reports run: | - cp compat_reports/jarhdf5-/${{ steps.set-hdf5lib-refname.outputs.HDF5R_VERS }}_to_${{ steps.set-hdf5lib-name.outputs.HDF5_VERS }}/compat_report.html ${{ inputs.file_base }}-java_compat_report.html + cp compat_reports/jarhdf5-/${{ steps.convert-hdf5lib-refname.outputs.HDF5R_DOTSMAIN }}_to_${{ steps.set-hdf5lib-name.outputs.HDF5_VERS }}/compat_report.html ${{ inputs.file_base }}-java_compat_report.html ls -l compat_reports/${{ inputs.file_base }}/X_to_Y cp compat_reports/${{ inputs.file_base }}/X_to_Y/compat_report.html ${{ inputs.file_base }}-hdf5_compat_report.html ls -l compat_reports/${{ inputs.file_base }}_hl/X_to_Y