test1

DennisHeimbigner · Oct 12, 2023 · 1062f4a · 1062f4a
1 parent 8912029
commit 1062f4a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/include/ncconfigure.h b/include/ncconfigure.h
@@ -61,9 +61,11 @@ extern "C" {
 #endif
 
 /* WARNING: in some systems, these functions may be defined as macros, so check */
+#if ! defined(HAVE_STRDUP) || defined(__CYGWIN__)
 #ifndef strdup
 char* strdup(const char*);
 #endif
+#endif
 
 #ifndef HAVE_STRLCAT
 #ifndef strlcat

diff --git a/libncxml/Makefile.am b/libncxml/Makefile.am
@@ -35,8 +35,8 @@ tinyxml2::
 	rm -fr ./tinyxml2 ./license.txt
 	git clone --depth=1 ${REPO}
 	cat tinyxml2/LICENSE.txt > ./license.txt
-	cat tinyxml2/tinyxml2.h > tinyxml2.h
-	cat  tinyxml2/tinyxml2.cpp \
+	tr -d '\r' < tinyxml2/tinyxml2.h > tinyxml2.h
+	cat tinyxml2/tinyxml2.cpp \
 	| sed -e 's/__BORLANDC__/__APPLE__/' \
 	| sed -e 's/ptrdiff_t/long/g' \
 	| sed -e '/^static[ ]*FILE[*][ ]*callfopen(/i\
@@ -49,5 +49,6 @@ tinyxml2::
 	| sed -e '/^XMLError[ ]*XMLDocument::Parse(/i\
 \#endif /*0*/\
 ' \
+	| tr -d '\r' \
 	| cat > ./tinyxml2.cpp
 	rm -fr tinyxml2