Skip to content

Commit

Permalink
Merge branch 'HDFGroup:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hyoklee authored Apr 13, 2024
2 parents 175e178 + 84fac90 commit 477cc2e
Show file tree
Hide file tree
Showing 105 changed files with 324 additions and 1,442 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BraceWrapping:
BreakBeforeBraces: Stroustrup
BreakAfterJavaFieldAnnotations: true
BreakStringLiterals: true
ColumnLimit: 110 # Update $max_trace_macro_line_len in bin/trace also
ColumnLimit: 110
IndentWidth: 4
---
Language: Cpp
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake-ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.10.0"
version: "1.9.7"

- name: Set file base name (Linux)
id: set-file-base
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
version: "1.10.0"
version: "1.9.7"

- name: Set file base name (MacOS)
id: set-file-base
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ around 10 minutes.

## Table of Contents

* [Workflow](#workflow)
* [Acceptance criteria for a pull request](#criteria)
* [Release Note](#releasenote)
* [Check List](#checklist)
* <a href="#workflow">Workflow</a>
* <a href="#criteria">Acceptance criteria for a pull request</a>
* <a href="#releasenote">Release Note</a>
* <a href="#checklist">Check List</a>

# Workflow <A NAME="workflow"></A>
<h2 id="workflow">Workflow</h2>

The process for contributing code to HDF5 is as follows:

Expand All @@ -41,7 +41,7 @@ Once a pull request is correctly formatted and passes **ALL** CI tests, it will
community members who can approve pull requests. The HDF Group developers will work with you to ensure that the pull request satisfies the acceptance
criteria described in the next section.

# Acceptance criteria for a pull request <A NAME="criteria"></A>
<h2 id="workflow">Workflow</h2>

We appreciate every contribution we receive, but we may not accept them all. Those that we *do* satisfy the following criteria:

Expand Down Expand Up @@ -84,7 +84,7 @@ application developers and not system administrators. Users who may find the REL
application developers, library developers, and system administrators.


# Release Note <A NAME="releasenote"></A>
<h2 id="releasenote">Release Note</h2>

* **Entry Syntax**
The release note entry syntax is shown below.
Expand Down Expand Up @@ -112,7 +112,7 @@ You might also consider the following as you describe the solution:
* Is there a workaround – a way for users design their software so as not to encounter the issue? If so, what is the workaround?
* For a performance fix, how has the performance improved? Links to published documentation would be good.

# Checklist <A NAME="checklist"></A>
<h2 id="checklist">Checklist</h2>

Please make sure that you check the items applicable to your pull request:

Expand Down
5 changes: 2 additions & 3 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ echo
# compilation.

# Run trace script
# The trace script adds H5TRACE macros to library source files. It should
# have no effect on files that don't have HDF5 API macros in them.
echo "Running trace script:"
# The trace script updates H5ARG_TRACE macros in library source files.
echo "Running arg trace script:"
bin/trace src/H5*.c || exit 1
echo

Expand Down
2 changes: 1 addition & 1 deletion bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Programs run via `autogen.sh` (or the equivalent in CMake) are indicated.
|`restore.sh`|Removes files generated by `autogen.sh`|
|`runbkprog`|Used by CMake to run test programs in the background|
|`switch_maint_mode`|Switches maintainer mode on/off in `configure.ac`|
|`trace`|Adds `TRACE` macros to HDF5 C library source files (run by `autogen.sh`)|
|`trace`|Updates `H5ARG_TRACE` macros in H5ES\_insert() calls (run by `autogen.sh`)|
|`warnhist`|Generates compiler warning statistics for gcc/clang when fed output of make|

## TODO
Expand Down
Loading

0 comments on commit 477cc2e

Please sign in to comment.