From 891d00d7026a623939c9ff964bdc4377a02bf6c5 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 16 Aug 2023 07:33:29 -0500
Subject: Correct CI settings (#3384)

* Correct CI settings

* Correct plugin file name
---
 .github/workflows/tarball.yml |  4 +--
 CMakePresets.json             | 61 ++++++++++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index fd84f10..844f5a1 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -103,9 +103,9 @@ jobs:
         run: |
           if [[ '${{ inputs.use_environ }}' == 'snapshots' && '${{ needs.check_commits.outputs.has_changes }}' == 'true' ]]
           then
-            FILE_NAME_BASE=$(echo "hdf5-${{ needs.check_commits.outputs.branch_ref }}-${{ needs.check_commits.outputs.branch_sha }}")
+            FILE_NAME_BASE=$(echo "${{ needs.check_commits.outputs.branch_ref }}-${{ needs.check_commits.outputs.branch_sha }}")
           else
-            FILE_NAME_BASE=$(echo "hdf5-${{ steps.version.outputs.TAG_VERSION }}")
+            FILE_NAME_BASE=$(echo "${{ steps.version.outputs.TAG_VERSION }}")
           fi
           echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
         shell: bash
diff --git a/CMakePresets.json b/CMakePresets.json
index 13766ca..03bad0a 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -14,28 +14,34 @@
       }
     },
     {
-      "name": "ci-StdCompression",
+      "name": "ci-CompressionVars",
       "hidden": true,
-      "inherits": "ci-base-tgz",
       "cacheVariables": {
         "BUILD_ZLIB_WITH_FETCHCONTENT": "ON",
         "ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
         "ZLIB_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/madler/zlib/releases/download/v1.2.13"},
         "ZLIB_TGZ_ORIGNAME": {"type": "STRING", "value": "zlib-1.2.13.tar.gz"},
-        "ZLIB_USE_LOCALCONTENT": "OFF",
         "BUILD_SZIP_WITH_FETCHCONTENT": "ON",
         "LIBAEC_PACKAGE_NAME": {"type": "STRING", "value": "libaec"},
         "LIBAEC_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/MathisRosenhauer/libaec/releases/download/v1.0.6"},
-        "LIBAEC_TGZ_ORIGNAME": {"type": "STRING", "value": "libaec-1.0.6.tar.gz"},
+        "LIBAEC_TGZ_ORIGNAME": {"type": "STRING", "value": "libaec-1.0.6.tar.gz"}
+      }
+    },
+    {
+      "name": "ci-StdCompression",
+      "hidden": true,
+      "inherits": ["ci-base-tgz", "ci-CompressionVars"],
+      "cacheVariables": {
+        "HDF5_PACKAGE_EXTLIBS": "ON",
+        "ZLIB_USE_LOCALCONTENT": "OFF",
         "LIBAEC_USE_LOCALCONTENT": "OFF"
       }
     },
     {
       "name": "ci-base-plugins",
       "hidden": true,
-      "inherits": "ci-base-tgz",
       "cacheVariables": {
-        "PLUGIN_TGZ_NAME": {"type": "STRING", "value": "hdf5_plugins-1.14.0.tar.gz"},
+        "PLUGIN_TGZ_NAME": {"type": "STRING", "value": "hdf5_plugins.tar.gz"},
         "PLUGIN_PACKAGE_NAME": {"type": "STRING", "value": "pl"},
         "BSHUF_TGZ_NAME": {"type": "STRING", "value": "bitshuffle.tar.gz"},
         "BSHUF_PACKAGE_NAME": {"type": "STRING", "value": "bshuf"},
@@ -63,32 +69,43 @@
       }
     },
     {
-      "name": "ci-StdPlugins",
+      "name": "ci-PluginsVars",
       "hidden": true,
-      "inherits": ["ci-base-plugins", "ci-base-tgz"],
       "cacheVariables": {
         "HDF5_ENABLE_PLUGIN_SUPPORT": "ON",
         "PLUGIN_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/HDFGroup/hdf5_plugins/archive/refs/tags"},
-        "PLUGIN_TGZ_ORIGNAME": {"type": "STRING", "value": "hdf5_plugins-1.14.0.tar.gz"}
+        "PLUGIN_TGZ_ORIGNAME": {"type": "STRING", "value": "hdf5_plugins-master.tar.gz"}
       }
     },
-     {
-      "name": "ci-StdExamples",
+    {
+      "name": "ci-StdPlugins",
+      "hidden": true,
+      "inherits": ["ci-base-plugins", "ci-PluginsVars", "ci-base-tgz"]
+    },
+    {
+      "name": "ci-ExamplesVars",
       "hidden": true,
-      "inherits": "ci-base",
       "cacheVariables": {
-        "HDF5_PACK_EXAMPLES": "ON",
         "HDF5_EXAMPLES_COMPRESSED": {"type": "STRING", "value": "hdf5-examples-2.0.3.tar.gz"},
         "HDF5_EXAMPLES_COMPRESSED_DIR": {"type": "STRING", "value": "${sourceParentDir}/temp"},
         "EXAMPLES_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/HDFGroup/hdf5-examples/archive/refs/tags/"},
-        "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "2.0.3.tar.gz"},
+        "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "2.0.3.tar.gz"}
+      }
+    },
+    {
+      "name": "ci-StdExamples",
+      "hidden": true,
+      "inherits": ["ci-base", "ci-ExamplesVars", "ci-base-tgz"],
+      "cacheVariables": {
+        "EXAMPLES_USE_LOCALCONTENT": "OFF",
+        "HDF5_PACK_EXAMPLES": "ON",
         "EXAMPLES_DOWNLOAD": "ON"
       }
     },
-   {
+    {
       "name": "ci-StdShar",
       "hidden": true,
-      "inherits": "ci-StdCompression",
+      "inherits": ["ci-StdCompression", "ci-StdExamples"],
       "cacheVariables": {
         "HDF_PACKAGE_NAMESPACE": {"type": "STRING", "value": "hdf5::"},
         "HDF5_INSTALL_MOD_FORTRAN": "NO",
@@ -105,8 +122,7 @@
         "ci-x64-Release-MSVC",
         "ci-CPP",
         "ci-Java",
-        "ci-StdShar",
-        "ci-StdExamples"
+        "ci-StdShar"
       ]
     },
     {
@@ -117,8 +133,7 @@
         "ci-CPP",
         "ci-Fortran",
         "ci-Java",
-        "ci-StdShar",
-        "ci-StdExamples"
+        "ci-StdShar"
       ]
     },
     {
@@ -129,8 +144,7 @@
         "ci-CPP",
         "ci-Fortran",
         "ci-Java",
-        "ci-StdShar",
-        "ci-StdExamples"
+        "ci-StdShar"
       ]
     },
     {
@@ -141,8 +155,7 @@
         "ci-CPP",
         "ci-Fortran",
         "ci-Java",
-        "ci-StdShar",
-        "ci-StdExamples"
+        "ci-StdShar"
       ]
     }
   ],
-- 
cgit v0.12