summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-10 20:11:11 (GMT)
committerGitHub <noreply@github.com>2021-03-10 20:11:11 (GMT)
commit93526f1e76148c56818fd3deca5c13d9c9dad2c5 (patch)
tree93efb808717010c8dd729dc0eefa62d6aa77af75
parent19b0ec7f17cd977238698fff0d21b1986dc27a54 (diff)
downloadhdf5-93526f1e76148c56818fd3deca5c13d9c9dad2c5.zip
hdf5-93526f1e76148c56818fd3deca5c13d9c9dad2c5.tar.gz
hdf5-93526f1e76148c56818fd3deca5c13d9c9dad2c5.tar.bz2
clang format push commit for 1 12 (#454)
* OESS-98 fix tools test for plugins * sync fork * Merge of changes from dev * Move problem option to bottom of the list until fixed * HDFFV-11106 - fix parsing optional args * HDFFV-11106 add note * grammer fix * Whitespace after clang formatting * Undo format version 11 changes * Update check to working version * Merge workflow and minor changes from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge serval small changes from dev * fix typo * Minor non-space formatting changes * GH #386 copyright corrections for java folder * revert because logic requires false return * Merges from develop #358 patches from vtk #361 fix header guard spelling * Remove case statement for H5I_EVENTSET * Correct call with versioning * Remove tabs * Double underscore change * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings Remove more underscores from header guards * Merge #380 from develop * Correct date entry * Split format source and commit changes on repo push * remove pre-split setting * Change windows TS to use older VS.
-rw-r--r--.github/workflows/clang-format-check.yml3
-rw-r--r--.github/workflows/clang-format-fix.yml25
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--.github/workflows/pr-check.yml4
-rw-r--r--MANIFEST1
5 files changed, 32 insertions, 5 deletions
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index 230a341..4f696e7 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -1,5 +1,6 @@
name: clang-format Check
-on: [workflow_dispatch, push, pull_request]
+on:
+ pull_request:
jobs:
formatting-check:
name: Formatting Check
diff --git a/.github/workflows/clang-format-fix.yml b/.github/workflows/clang-format-fix.yml
new file mode 100644
index 0000000..082d617
--- /dev/null
+++ b/.github/workflows/clang-format-fix.yml
@@ -0,0 +1,25 @@
+name: clang-format Check
+on:
+ workflow_dispatch:
+ push:
+jobs:
+ formatting-check:
+ name: Formatting Check
+ runs-on: ubuntu-latest
+ if: "!contains(github.event.head_commit.message, 'skip-ci')"
+ steps:
+ - uses: actions/checkout@v2
+ - name: Run clang-format style check for C programs.
+ uses: DoozyX/clang-format-lint-action@v0.11
+ with:
+ source: '.'
+ extensions: 'c,h,cpp,hpp'
+ clangFormatVersion: 10
+ inplace: True
+ style: file
+ exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h'
+ - uses: EndBug/add-and-commit@v7
+ with:
+ author_name: github-actions
+ author_email: 41898282+github-actions[bot]@users.noreply.github.com
+ message: 'Committing clang-format changes'
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
diff --git a/MANIFEST b/MANIFEST
index f907988..4fe8b2b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -35,6 +35,7 @@
./.clang-format
./.github/CODEOWNERS _DO_NOT_DISTRIBUTE_
+./.github/workflows/clang-format-fix.yml _DO_NOT_DISTRIBUTE_
./.github/workflows/clang-format-check.yml _DO_NOT_DISTRIBUTE_
./.github/workflows/main.yml _DO_NOT_DISTRIBUTE_
./.github/workflows/pr-check.yml _DO_NOT_DISTRIBUTE_