From fb76574b2652d451f711b729ad1bb6a4b7c4ad2f Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Thu, 6 Jul 2023 13:24:12 -0600 Subject: [PATCH] test1 --- .github/workflows/run_tests_osx.yml | 2 +- .github/workflows/run_tests_s3.yml | 2 +- .github/workflows/run_tests_ubuntu.yml | 2 +- .github/workflows/run_tests_win_cygwin.yml | 2 +- .github/workflows/run_tests_win_mingw.yml | 2 +- CMakeLists.txt | 3 +++ configure.ac | 4 +++- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml index c887c6b1e6..da1421729b 100644 --- a/.github/workflows/run_tests_osx.yml +++ b/.github/workflows/run_tests_osx.yml @@ -7,7 +7,7 @@ name: Run macOS-based netCDF Tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] jobs: diff --git a/.github/workflows/run_tests_s3.yml b/.github/workflows/run_tests_s3.yml index 0a1c942460..aca54f6eef 100644 --- a/.github/workflows/run_tests_s3.yml +++ b/.github/workflows/run_tests_s3.yml @@ -9,7 +9,7 @@ name: Run S3 netCDF Tests (under Ubuntu Linux) -on: [workflow_dispatch] +on: [push,workflow_dispatch] jobs: diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml index fcd2eba7db..fa1c16e5c5 100644 --- a/.github/workflows/run_tests_ubuntu.yml +++ b/.github/workflows/run_tests_ubuntu.yml @@ -4,7 +4,7 @@ name: Run Ubuntu/Linux netCDF Tests -on: [pull_request, workflow_dispatch] +on: [push,pull_request, workflow_dispatch] jobs: diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml index bc084a401f..5a2536b7cc 100644 --- a/.github/workflows/run_tests_win_cygwin.yml +++ b/.github/workflows/run_tests_win_cygwin.yml @@ -1,6 +1,6 @@ name: Run Cygwin-based tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] env: SHELLOPTS: igncr diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml index 7b8bfef208..16264a9f46 100644 --- a/.github/workflows/run_tests_win_mingw.yml +++ b/.github/workflows/run_tests_win_mingw.yml @@ -9,7 +9,7 @@ name: Run MSYS2, MinGW64-based Tests env: CPPFLAGS: "-D_BSD_SOURCE" -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] jobs: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3721a8fbb5..11d25b82ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1058,6 +1058,9 @@ ELSE() SET(ENABLE_DAP4 OFF CACHE BOOL "") ENDIF() +# Temporarily disable DAP4 +SET(ENABLE_DAP4 ON CACHE BOOL "") + # Option to support byte-range reading of remote datasets OPTION(ENABLE_BYTERANGE "Enable byte-range access to remote datasets.." ON) if(NOT ENABLE_REMOTE_FUNCTIONALITY) diff --git a/configure.ac b/configure.ac index 9acb948729..d1eadd3baa 100644 --- a/configure.ac +++ b/configure.ac @@ -611,7 +611,9 @@ fi AM_CONDITIONAL(ENABLE_QUANTIZE, [test x$enable_quantize = xyes]) # --enable-dap => enable-dap4 -enable_dap4=$enable_dap +# Temporarily disable DAP4 +#enable_dap4=$enable_dap +enable_dap4=no AC_MSG_CHECKING([whether dap use of remotetest server should be enabled]) AC_ARG_ENABLE([dap-remote-tests], [AS_HELP_STRING([--disable-dap-remote-tests],