Skip to content

Commit 7d111a7

Browse files
WardFWardF
committed
Merge remote-tracking branch 'upstream/main' into silence-libdispatch-warnings
2 parents c725114 + 2e40e7c commit 7d111a7

23 files changed

+1680
-1423
lines changed

‎.github/workflows/main-cmake.yml

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
name: NetCDF-C CMake CI - Windows
2+
3+
on: [pull_request, workflow_dispatch]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
11+
cmake_build_and_test:
12+
strategy:
13+
14+
matrix:
15+
name:
16+
- "Windows MSVC"
17+
hdf5:
18+
- "1.14.3"
19+
20+
# Visual Studio + CMake
21+
include:
22+
- name: "Windows MSVC"
23+
os: windows-latest
24+
generator: "-G \"Visual Studio 17 2022\""
25+
26+
name: "${{ matrix.name }}"
27+
28+
runs-on: ${{ matrix.os }}
29+
30+
# Each step in the job.
31+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
32+
steps:
33+
- uses: msys2/setup-msys2@v2
34+
with:
35+
update: true
36+
- uses: actions/checkout@v4
37+
- uses: conda-incubator/setup-miniconda@v3
38+
with:
39+
miniconda-version: "latest"
40+
activate-environment: ""
41+
auto-activate-base: true
42+
43+
- name: Set up Paths and env
44+
shell: bash -el {0}
45+
run: |
46+
echo "" >> ~/.bash_profile
47+
cat ~/.bash_profile
48+
49+
50+
- name: Dump Matrix Context
51+
run: echo '${{ toJSON(matrix) }}'
52+
53+
#- run: echo "CMAKE_PREFIX_PATH=${env.CONDA_PREFIX}/Library" >> $GITHUB_ENV
54+
#- run: echo "/c/Users/runneradmin/miniconda3/Library/lib:${GITHUB_PATH}" >> $GITHUB_ENV
55+
#- run: echo ""
56+
#- run: echo "CTEST_OUTPUT_ON_FAILURE=1" >> $GITHUB_ENV
57+
58+
# Grab miniconda and use it to install HDF5
59+
- name: Install Dependencies using Miniconda
60+
run: |
61+
conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
62+
conda config --add channels conda-forge
63+
conda update conda
64+
conda install hdf5=${{ matrix.hdf5 }} m2-m4 libxml2
65+
shell: bash -el {0}
66+
67+
# Double-check something
68+
- name: Check Miniconda
69+
run: |
70+
which h5dump
71+
which m4
72+
shell: bash -el {0}
73+
74+
# Check current directory
75+
- name: Query Current Environment
76+
run: |
77+
ls
78+
echo ""
79+
echo "PATH: $PATH"
80+
echo ""
81+
env
82+
echo ""
83+
ls $CONDA_PREFIX/Library
84+
echo ""
85+
ls $CONDA_PREFIX/Library/include/
86+
shell: bash -el {0}
87+
88+
- name: Perform out-of-directory configuration
89+
shell: bash -el {0}
90+
run: |
91+
mkdir build
92+
cd build
93+
cmake .. -DCMAKE_PREFIX_PATH="${CONDA_PREFIX}/Library" -DCMAKE_C_FLAGS="-I${CONDA_PREFIX}/Library/include" -DCMAKE_INSTALL_PREFIX=~/tmp -DNETCDF_ENABLE_FILTER_TESTING=OFF
94+
if: ${{ success() }}
95+
96+
- name: View cache - configuration
97+
shell: bash -el {0}
98+
run: |
99+
cd build
100+
cmake -L .
101+
if: ${{ success() }}
102+
103+
- name: Print Summary
104+
shell: bash -el {0}
105+
run: |
106+
cd build
107+
cat libnetcdf.settings
108+
109+
- name: Perform out-of-directory build - libnetcdf
110+
shell: bash -el {0}
111+
run: |
112+
cd build
113+
cmake --build . --config Release --target netcdf -j 4
114+
115+
- name: Perform out-of-directory install - libnetcdf
116+
shell: bash -el {0}
117+
run: |
118+
cd build
119+
cmake --build . --config Release --target install -j 4
120+
if: ${{ success() }}
121+
122+
- name: View config.h - libnetcdf failure
123+
shell: bash -el {0}
124+
run: |
125+
cd build
126+
cat config.h
127+
if: ${{ failure() }}
128+
129+
- name: Perform out-of-directory build - test suite
130+
shell: bash -el {0}
131+
run: |
132+
cd build
133+
cmake --build . --config Release -j 4
134+
if: ${{ success() }}
135+
136+
- name: View config.h - tests failure failure
137+
shell: bash -el {0}
138+
run: |
139+
cd build
140+
cat config.h
141+
if: ${{ failure() }}
142+
143+
- name: Prepare ctest Paths and env
144+
shell: bash -el {0}
145+
run: |
146+
cat ~/.bash_profile
147+
echo "" >> ~/.bash_profile
148+
149+
- name: Run ctest
150+
shell: bash -el {0}
151+
run: |
152+
echo "Run ctest PATH: $PATH"
153+
echo "Run ctest combined PATH: $PATH"
154+
echo "Run ctest combined GITHUB_PATH: $PATH"
155+
cd build
156+
PATH=~/tmp/bin:$PATH ctest . -j 4 -E 'bom' --output-on-failure
157+
158+
- name: Verbose Output if CTest Failure
159+
shell: bash -el {0}
160+
run: |
161+
cd build
162+
PATH=~/tmp/bin:$PATH ctest . --rerun-failed --output-on-failure -VV
163+
if: ${{ failure() }}

‎.github/workflows/run_tests_cdash.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
2222

2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525

2626
- name: Install System dependencies
2727
shell: bash -l {0}
@@ -32,7 +32,7 @@ jobs:
3232
###
3333
- name: Cache libhdf5-${{ matrix.hdf5 }}
3434
id: cache-hdf5
35-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3636
with:
3737
path: ~/environments/${{ matrix.hdf5 }}
3838
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -70,7 +70,7 @@ jobs:
7070

7171
steps:
7272

73-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7474

7575
- name: Install System dependencies
7676
shell: bash -l {0}
@@ -81,7 +81,7 @@ jobs:
8181
###
8282
- name: Cache libhdf5-parallel-${{ matrix.hdf5 }}
8383
id: cache-hdf5
84-
uses: actions/cache@v3
84+
uses: actions/cache@v4
8585
with:
8686
path: ~/environments/${{ matrix.hdf5 }}
8787
key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -129,7 +129,7 @@ jobs:
129129
hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
130130

131131
steps:
132-
- uses: actions/checkout@v3
132+
- uses: actions/checkout@v4
133133
with:
134134
CDASH_TOKEN: ${{ secrets.CDASH_TOKEN }}
135135
env:
@@ -153,7 +153,7 @@ jobs:
153153

154154
- name: Fetch HDF Cache
155155
id: cache-hdf5
156-
uses: actions/cache@v3
156+
uses: actions/cache@v4
157157
with:
158158
path: ~/environments/${{ matrix.hdf5 }}
159159
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}

‎.github/workflows/run_tests_osx.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424

2525
steps:
2626

27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828

2929
###
3030
# libhdf5
3131
###
3232
- name: Cache libhdf5-${{ runner.os }}-${{ matrix.hdf5 }}
3333
id: cache-hdf5-osx
34-
uses: actions/cache@v3
34+
uses: actions/cache@v4
3535
with:
3636
path: ~/environments/${{ matrix.hdf5 }}
3737
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -62,7 +62,7 @@ jobs:
6262
use_nczarr: [ nczarr_off, nczarr_on ]
6363
steps:
6464

65-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6666

6767
###
6868
# Set Environmental Variables
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Fetch HDF Cache
9696
id: cache-hdf-osx
97-
uses: actions/cache@v3
97+
uses: actions/cache@v4
9898
with:
9999
path: ~/environments/${{ matrix.hdf5 }}
100100
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -168,7 +168,7 @@ jobs:
168168
use_nczarr: [ nczarr_off, nczarr_on ]
169169
steps:
170170

171-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
172172

173173
###
174174
# Set Environmental Variables
@@ -200,7 +200,7 @@ jobs:
200200

201201
- name: Fetch HDF Cache
202202
id: cache-hdf5-osx
203-
uses: actions/cache@v3
203+
uses: actions/cache@v4
204204
with:
205205
path: ~/environments/${{ matrix.hdf5 }}
206206
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -260,7 +260,7 @@ jobs:
260260
hdf5: [ 1.12.2, 1.14.3 ]
261261
steps:
262262

263-
- uses: actions/checkout@v3
263+
- uses: actions/checkout@v4
264264

265265
###
266266
# Set Environmental Variables
@@ -277,7 +277,7 @@ jobs:
277277

278278
- name: Fetch HDF Cache
279279
id: cache-hdf-osx
280-
uses: actions/cache@v3
280+
uses: actions/cache@v4
281281
with:
282282
path: ~/environments/${{ matrix.hdf5 }}
283283
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -342,7 +342,7 @@ jobs:
342342

343343
steps:
344344

345-
- uses: actions/checkout@v3
345+
- uses: actions/checkout@v4
346346

347347
###
348348
# Set Environmental Variables
@@ -357,7 +357,7 @@ jobs:
357357

358358
- name: Fetch HDF Cache
359359
id: cache-hdf5-osx
360-
uses: actions/cache@v3
360+
uses: actions/cache@v4
361361
with:
362362
path: ~/environments/${{ matrix.hdf5 }}
363363
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -416,7 +416,7 @@ jobs:
416416

417417
steps:
418418

419-
- uses: actions/checkout@v3
419+
- uses: actions/checkout@v4
420420

421421
###
422422
# Set Environmental Variables
@@ -432,7 +432,7 @@ jobs:
432432

433433
- name: Fetch HDF Cache
434434
id: cache-hdf5-osx
435-
uses: actions/cache@v3
435+
uses: actions/cache@v4
436436
with:
437437
path: ~/environments/${{ matrix.hdf5 }}
438438
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}

‎.github/workflows/run_tests_s3.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: Install System dependencies
3232
shell: bash -l {0}
@@ -37,7 +37,7 @@ jobs:
3737
###
3838
- name: Cache libhdf5-${{ matrix.hdf5 }}
3939
id: cache-hdf5
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: ~/environments/${{ matrix.hdf5 }}
4343
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -73,7 +73,7 @@ jobs:
7373
hdf5: [ 1.14.3 ]
7474
steps:
7575

76-
- uses: actions/checkout@v3
76+
- uses: actions/checkout@v4
7777

7878
- name: Install System dependencies
7979
shell: bash -l {0}
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Fetch HDF Cache
9696
id: cache-hdf
97-
uses: actions/cache@v3
97+
uses: actions/cache@v4
9898
with:
9999
path: ~/environments/${{ matrix.hdf5 }}
100100
key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}

0 commit comments

Comments
 (0)