Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Add Cygwin CMake run #2

Open
wants to merge 62 commits into
base: ci-mingw
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
424e628
Remove unused argument from internal function
ZedThree Mar 25, 2024
dc05449
Fix some conversion warnings in ncdap4
ZedThree Mar 25, 2024
0b98970
Make `debugcrc32` signature match that of `NC_crc32` (which it wraps)
ZedThree Mar 25, 2024
6f092f0
Fix types in binary search function
ZedThree Mar 25, 2024
607ae02
Change some struct member types to avoid conversion warnings
ZedThree Mar 25, 2024
a04cfdd
Fix some casts from macros in ncdap4
ZedThree Mar 25, 2024
920ec70
Change format of backwards-loop to allow correct types
ZedThree Mar 25, 2024
a669cb7
debug1
DennisHeimbigner Apr 17, 2024
55d14d6
test1
DennisHeimbigner Apr 17, 2024
042dc4a
ckp
DennisHeimbigner Apr 18, 2024
9d95d70
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner Apr 18, 2024
40b7cfc
Merge branch 'main' into silence-ncdap4-warnings
ZedThree Apr 25, 2024
54fb03e
Fix conversion warning in flag set/check/clear macros
ZedThree Apr 25, 2024
fa882d4
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner Apr 26, 2024
f8976ad
revert
DennisHeimbigner Apr 28, 2024
9a8dfcf
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner May 2, 2024
e31e08f
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner May 7, 2024
211538c
Modify ncdump to print char-valued variables as utf8.
DennisHeimbigner May 7, 2024
58e37e0
Merge pull request #2921 from DennisHeimbigner/utf8dump.dmh
WardF May 7, 2024
ebd3f36
Modify CMakeLists.txt to honor CMAKE_INSTALL_MANDIR in support of htt…
WardF May 7, 2024
8d7916c
Merge pull request #2922 from WardF/gh2920.wif
WardF May 8, 2024
fbe383d
CI: Add Cygwin CMake run
DWesl May 9, 2024
e2bbe13
BUG: Try to fix CI YAML syntax.
DWesl May 9, 2024
cbc4aa6
FIX: Run initial git command with Windows shell.
DWesl May 9, 2024
4ec1b93
FIX: Capitalization of Makefile CMake builder
DWesl May 9, 2024
8cd7881
FIX: Ensure running Cygwin CMake
DWesl May 9, 2024
8a52acb
FIX: Install C++ compiler.
DWesl May 9, 2024
bc522f1
FIX: Force MAKE=/usr/bin/make
DWesl May 9, 2024
52eaf08
FIX: Force CXX=/usr/bin/g++
DWesl May 9, 2024
6a1716d
FIX: Ensure CMake build has C++
DWesl May 9, 2024
c841dce
Merge branch 'main' into silence-ncdap4-warnings
ZedThree May 10, 2024
69ed78e
Convert the ENABLE_XXX options to NETCDF_ENABLE_XXX options
DennisHeimbigner May 11, 2024
9d8f2e2
Update release notes
DennisHeimbigner May 12, 2024
2960f56
Merge pull request #2923 from DennisHeimbigner/optionchange.dmh
WardF May 13, 2024
986b95c
ENH:Cygwin: Set plugin prefix and suffix in CMake.
DWesl May 13, 2024
ef5fcf9
ftp --> resources
oxelson May 13, 2024
5b333a7
Merge pull request #2924 from oxelson/main
WardF May 14, 2024
f8164e3
Merge pull request #2917 from MehdiChinoune/ci-mingw
WardF May 15, 2024
12840ab
Merge branch 'main' into silence-ncdap4-warnings
ZedThree May 15, 2024
f0f0f39
Cleanup various Zarr-related build issues
DennisHeimbigner May 16, 2024
5d70252
Merge pull request #2898 from ZedThree/silence-ncdap4-warnings
WardF May 16, 2024
d80c6d2
Merge branch 'master' into cleanup.dmh
DennisHeimbigner May 16, 2024
e2fc648
Update release notes
DennisHeimbigner May 16, 2024
517d0b4
Merge pull request #2926 from DennisHeimbigner/cleanup.dmh
WardF May 20, 2024
9a478ed
Fix duplicate definition when using aws-sdk-cpp.
DennisHeimbigner May 21, 2024
09a5fa3
Merge pull request #2928 from DennisHeimbigner/sdkinit.dmh
WardF May 22, 2024
92f71ed
CI: Remove a few environment variables from Cygwin CMake build
DWesl May 24, 2024
0c10f11
TST: Skip nc_test4_tst_filter on Cygwin.
DWesl May 24, 2024
ff5a18d
CI: Don't enable DAP on Cygwin
DWesl May 24, 2024
1770b75
BUG: Fix CMake syntax for Cygwin plugin prefix/suffix
DWesl May 24, 2024
fd637fd
Cleanup handling of NETCDF_ENABLE_SET_LOG_LEVEL and NETCDF_ENABLE_SET…
DennisHeimbigner May 24, 2024
ddb0043
Update release notes
DennisHeimbigner May 25, 2024
cb321fa
Fix a few issues related to detection of libhdf4.
WardF Jun 4, 2024
d431224
Update deprecated function list.
WardF Jun 4, 2024
27f1bbf
Merge pull request #2933 from WardF/fix-hdf4-detection.wif
WardF Jun 4, 2024
8af3891
Remove redunandant option.
WardF Jun 6, 2024
ec202ff
Make change to config.h generated by cmake
WardF Jun 6, 2024
1a83e12
Clean up surperflous options that will always align with the value of…
WardF Jun 6, 2024
6abcddb
Merge pull request #2931 from DennisHeimbigner/loglevel.dmh
WardF Jun 7, 2024
effdd8a
Add compiler flag to fix infinities issue with intel compilers.
WardF Jun 12, 2024
be009ed
Merge pull request #2935 from WardF/gh2700.wif
WardF Jun 12, 2024
aa4cdf8
Merge upstream into patch-4
DWesl Jun 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: NetCDF-C CMake CI - Windows

on: [pull_request, workflow_dispatch]

env:
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -160,4 +163,4 @@ jobs:
run: |
cd build
PATH=~/tmp/bin:$PATH ctest . --rerun-failed --output-on-failure -VV
if: ${{ failure() }}
if: ${{ failure() }}
5 changes: 4 additions & 1 deletion .github/workflows/run_tests_cdash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

name: Run CDash Ubuntu/Linux netCDF Tests

on: workflow_dispatch
on: [workflow_dispatch]

env:
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
cancel-in-progress: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ jobs:

- name: Configure
shell: bash -l {0}
run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --disable-xml2
run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --disable-libxml2
if: ${{ success() }}

- name: Look at config.log if error
Expand Down
157 changes: 0 additions & 157 deletions .github/workflows/run_tests_s3.yml

This file was deleted.

9 changes: 6 additions & 3 deletions .github/workflows/run_tests_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

name: Run Ubuntu/Linux netCDF Tests

on: [pull_request, workflow_dispatch]
on: [pull_request,workflow_dispatch]

env:
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down Expand Up @@ -171,7 +174,7 @@ jobs:

- name: Configure
shell: bash -l {0}
run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --enable-doxygen --enable-external-server-tests --disable-xml2
run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --enable-doxygen --enable-external-server-tests --disable-libxml2
if: ${{ success() }}

- name: Look at config.log if error
Expand Down Expand Up @@ -266,7 +269,7 @@ jobs:

- name: Configure
shell: bash -l {0}
run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --enable-doxygen --enable-external-server-tests --disable-xml2 --disable-shared --enable-static
run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --enable-doxygen --enable-external-server-tests --disable-libxml2 --disable-shared --enable-static
if: ${{ success() }}

- name: Look at config.log if error
Expand Down
78 changes: 75 additions & 3 deletions .github/workflows/run_tests_win_cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ env:
SHELLOPTS: igncr
CHERE_INVOKING: 1
CYGWIN_NOWINPATH: 1
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

jobs:
build-and-test-autotools:
runs-on: windows-latest
defaults:
run:
shell: bash -eo pipefail -o igncr "{0}"
shell: C:/cygwin/bin/bash.exe -eo pipefail -o igncr "{0}"

name: Cygwin-based Autotools tests

Expand All @@ -26,18 +27,20 @@ jobs:

steps:
- name: Fix line endings
shell: pwsh
run: git config --global core.autocrlf input

- uses: actions/checkout@v4

- uses: cygwin/cygwin-install-action@v2
- uses: cygwin/cygwin-install-action@v4
with:
platform: x86_64
install-dir: 'C:\cygwin'
packages: >-
git automake libtool autoconf2.5 make libhdf5-devel
libhdf4-devel zipinfo libxml2-devel perl zlib-devel
libzstd-devel libbz2-devel libaec-devel libzip-devel
libdeflate-devel gcc-core libcurl-devel libiconv-devel
libdeflate-devel gcc-core gcc-g++ libcurl-devel libiconv-devel
libssl-devel libcrypt-devel

- name: (Autotools) Run autoconf and friends
Expand Down Expand Up @@ -79,3 +82,72 @@ jobs:
timeout-minutes: 30
run: |
make check -j8 SHELL=/bin/dash

build-and-test-cmake:
name: Cygwin-based CMake tests
runs-on: windows-latest
defaults:
run:
shell: C:/cygwin/bin/bash.exe -eo pipefail -o igncr "{0}"

steps:

- run: git config --global core.autocrlf input
shell: pwsh
- uses: actions/checkout@v4
- uses: cygwin/cygwin-install-action@v4
with:
platform: x86_64
install-dir: 'C:\cygwin'
packages: >-
git automake libtool autoconf2.5 make libhdf5-devel
libhdf4-devel zipinfo libxml2-devel perl zlib-devel
libzstd-devel libbz2-devel libaec-devel libzip-devel
libdeflate-devel gcc-core gcc-g++ libcurl-devel libiconv-devel
libssl-devel libcrypt-devel cmake ninja make m4 diffutils unzip

###
# Configure and build
###

- name: (CMake) Configure Build
env:
MAKE: "/usr/bin/make"
CXX: "/usr/bin/g++"
run: |
/usr/bin/cmake \
-G"Unix Makefiles" \
-B build \
-S . \
-DCMAKE_INSTALL_PREFIX=/tmp \
-DBUILD_SHARED_LIBS=ON \
-DNETCDF_ENABLE_NETCDF_4=ON \
-DNETCDF_BUILD_UTILITIES=ON \
-DNETCDF_ENABLE_TESTS=ON \
-DNETCDF_ENABLE_HDF5=ON \
-DNETCDF_ENABLE_NCZARR=TRUE \
-DNETCDF_ENABLE_PLUGINS=ON
if: ${{ success() }}

- name: (CMake) Look at CMakeCache.txt if error
run: cat build/CMakeCache.txt
if: ${{ failure() }}

- name: (CMake) Print Summary
run: cat build/libnetcdf.settings

- name: (CMake) Build All
env:
MAKE: "/usr/bin/make"
CXX: "/usr/bin/g++"
run: cmake --build build -j$(nproc)
if: ${{ success() }}

- name: (CMake) Run Tests
run: PATH=$PWD/build:$PATH ctest --test-dir build
if: ${{ success() }}

- name: (CMake) Verbose output of CTest failures
run: >-
PATH=$PWD/build:$PATH ctest --test-dir build --output-on-failure -j$(nproc) --rerun-failed -VV
if: ${{ failure() }}
4 changes: 4 additions & 0 deletions .github/workflows/run_tests_win_mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

name: Run MSYS2, MinGW64-based Tests (Not Visual Studio)

env:
CPPFLAGS: "-D_BSD_SOURCE"
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

on: [pull_request,workflow_dispatch]

concurrency:
Expand Down
Loading
Loading