summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-10 20:08:42 (GMT)
committerGitHub <noreply@github.com>2021-03-10 20:08:42 (GMT)
commite5a2d01cd9e3b5fd34d265fe281f638316894f7a (patch)
tree4fbfb1d84991957b5f464809f35ffcbd7717d001 /.github/workflows
parentdd5b8a874757f23a1906d0a80ee77a112ad4a33d (diff)
downloadhdf5-e5a2d01cd9e3b5fd34d265fe281f638316894f7a.zip
hdf5-e5a2d01cd9e3b5fd34d265fe281f638316894f7a.tar.gz
hdf5-e5a2d01cd9e3b5fd34d265fe281f638316894f7a.tar.bz2
1.10 Change GITHUB actions Windows TS os (#459)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge small changes from develop * Minor non-space formatting changes * #386 copyright corrections for java folder * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merge updates #358 patches from vtk #361 fix header guard spelling * format fix * Fix missing underscore and make H5public.h closer to dev * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings header guard underscore cleanup JNI cleanup * format alignment * Add missing test ref file * Merge #380 from develop * Finish java merges from develop * Fix java issues with tests and javadoc * Correct use of attribute access plist * Remove debug code * Remove unused variable * Change file access to read only for java tests * Split clang format operations. * More javadoc comments * Remove pre-split setting * format source * Change windows TS to use older VS.
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--.github/workflows/pr-check.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d0d3bb..78e1115 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -82,7 +82,7 @@ jobs:
# Threadsafe runs
- name: "Windows TS MSVC"
artifact: "Windows-MSVCTS.tar.xz"
- os: windows-latest
+ os: windows-2016
build_type: "Release"
toolchain: ""
cpp: OFF
@@ -91,7 +91,7 @@ jobs:
ts: ON
hl: OFF
parallel: OFF
- generator: "-G \"Visual Studio 16 2019\" -A x64"
+ generator: "-G \"Visual Studio 15 2017 Win64\""
- name: "Ubuntu TS GCC"
artifact: "LinuxTS.tar.xz"
os: ubuntu-latest
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 8c3bb2c..b50bf59 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -77,7 +77,7 @@ jobs:
# Threadsafe runs
- name: "Windows TS MSVC"
artifact: "Windows-MSVCTS.tar.xz"
- os: windows-latest
+ os: windows-2016
build_type: "Release"
toolchain: ""
cpp: OFF
@@ -86,7 +86,7 @@ jobs:
ts: ON
hl: OFF
parallel: OFF
- generator: "-G \"Visual Studio 16 2019\" -A x64"
+ generator: "-G \"Visual Studio 15 2017 Win64\""
- name: "Ubuntu TS GCC"
artifact: "LinuxTS.tar.xz"
os: ubuntu-latest