diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-10-07 17:37:07 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-07 17:37:07 (GMT) |
commit | 1a6fba9418cf82fec8c880ac4f276c192cbfdae0 (patch) | |
tree | 4696bb13738b999f5bfa7bc8cf6cc8954f948ba4 | |
parent | 66bcfd97a80870fb8336ba218541e2b477448d89 (diff) | |
parent | 5fd179dbcd930a053ae0acdca9b7016a231646f8 (diff) | |
download | hdf5-1a6fba9418cf82fec8c880ac4f276c192cbfdae0.zip hdf5-1a6fba9418cf82fec8c880ac4f276c192cbfdae0.tar.gz hdf5-1a6fba9418cf82fec8c880ac4f276c192cbfdae0.tar.bz2 |
Merge pull request #25 from byrnHDF/develop
gitub workflow changes
-rw-r--r-- | .github/CODEOWNERS | 28 | ||||
-rw-r--r-- | .github/workflows/main.yml | 4 | ||||
-rw-r--r-- | .github/workflows/pr-check.yml | 4 | ||||
-rw-r--r-- | MANIFEST | 1 | ||||
-rw-r--r-- | config/cmake/HDF5_Process_Flex_Files.cmake | 111 |
5 files changed, 18 insertions, 130 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 31b194f..97b7428 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,36 +7,36 @@ # Order is important. The last matching pattern has the most precedence. # So if a pull request only touches javascript files, only these owners # will be requested to review. -*.cmake @byrnHDF -CMakeLists.txt @byrnHDF -CMakeTests.* @byrnHDF +*.cmake @byrnHDF @derobins +CMakeLists.txt @byrnHDF @derobins +CMakeTests.* @byrnHDF @derobins -/bin/ @lrknox @derobins @byrnHDF +/bin/ @lrknox @derobins @qkoziol -/c++/ bmribler@hdfgroup.org +/c++/ @bmribler @byrnHDF -/config/ @lrknox @derobins @byrnHDF +/config/ @lrknox @derobins @qkoziol @byrnHDF -/doc/ @gnuoyd mainzer@hdfgroup.org +/doc/ @gnuoyd @jrmainzer -/examples/ @lrknox @derobins bljones@hdfgroup.org +/examples/ @lrknox @derobins @bljhdf /fortran/ @brtnfld @epourmal -/hl/ bmribler@hdfgroup.org +/hl/ @bmribler @byrnHDF /java/ @jhendersonHDF @byrnHDF /m4/ @lrknox @derobins -/release_docs/ @lrknox bljones@hdfgroup.org @byrnHDF +/release_docs/ @lrknox @bljhdf @byrnHDF -/src/ @jhendersonHDF @derobins @fortnern @qkoziol @soumagne @vchoi-hdfgroup mainzer@hdfgroup.org +/src/ @jhendersonHDF @derobins @fortnern @qkoziol @soumagne @vchoi-hdfgroup @jrmainzer -/test/ @jhendersonHDF @derobins @fortnern @qkoziol @soumagne @vchoi-hdfgroup mainzer@hdfgroup.org +/test/ @jhendersonHDF @derobins @fortnern @qkoziol @soumagne @vchoi-hdfgroup @jrmainzer -/testpar/ @jhendersonHDF @rawarren mainzer@hdfgroup.org +/testpar/ @jhendersonHDF @rawarren @jrmainzer @qkoziol -/tools/ @byrnHDF +/tools/ @byrnHDF @bmribler /utils/ @lrknox @byrnHDF diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6dad657..a7faaa7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,8 +95,8 @@ jobs: if: matrix.os == 'windows-latest' run: | # Set these env vars so cmake picks the correct compiler - echo "::set-env name=CXX::cl.exe" - echo "::set-env name=CC::cl.exe" + echo "CXX=cl.exe" >> $GITHUB_ENV + echo "CC=cl.exe" >> $GITHUB_ENV # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Get Sources diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index e3b9d9b..7cce4d0 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -89,8 +89,8 @@ jobs: if: matrix.os == 'windows-latest' run: | # Set these env vars so cmake picks the correct compiler - echo "::set-env name=CXX::cl.exe" - echo "::set-env name=CC::cl.exe" + echo "CXX=cl.exe" >> $GITHUB_ENV + echo "CC=cl.exe" >> $GITHUB_ENV # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Get Sources @@ -3453,7 +3453,6 @@ ./config/cmake/HDFCompilerFlags.cmake ./config/cmake/HDFCXXCompilerFlags.cmake ./config/cmake/HDFFortranCompilerFlags.cmake -./config/cmake/HDF5_Process_Flex_Files.cmake ./config/cmake/HDF5Macros.cmake ./config/cmake/HDF5PluginMacros.cmake ./config/cmake/HDF5UseFortran.cmake diff --git a/config/cmake/HDF5_Process_Flex_Files.cmake b/config/cmake/HDF5_Process_Flex_Files.cmake deleted file mode 100644 index 9445545..0000000 --- a/config/cmake/HDF5_Process_Flex_Files.cmake +++ /dev/null @@ -1,111 +0,0 @@ -# -# Copyright by The HDF Group. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. -# If you do not have access to either file, you may request a copy from -# help@hdfgroup.org. -# -# post process flex/bison files - -message (STATUS "File: ${GEN_DIR} ${FILE_PARSE} ${FILE_ANALYZE}") - -if (FILE_PARSE) - # fix H5LTparse.c to declare H5LTyyparse return type as an hid_t - # instead of int. Currently the generated function H5LTyyparse is - # generated with a return value of type int, which is a mapping to the - # flex yyparse function. The return value in the HL library should be - # an hid_t. - # I propose to not use flex to generate this function, but for now I am - # adding a perl command to find and replace this function declaration in - # H5LTparse.c. - file (READ ${GEN_DIR}/${FILE_PARSE}.c TEST_STREAM) - string (REGEX REPLACE "int yyparse" "hid_t yyparse" TEST_STREAM "${TEST_STREAM}") - string (REGEX REPLACE "int\nyyparse" "hid_t\nyyparse" TEST_STREAM "${TEST_STREAM}") - string (REGEX REPLACE "int H5LTyyparse" "hid_t H5LTyyparse" TEST_STREAM "${TEST_STREAM}") - file (WRITE ${FILE_PARSE}.c "${TEST_STREAM}") - message (STATUS "replacing signature in H5LTparse.c") - - # Add code that disables warnings in the flex/bison-generated code. - # - # Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions - # will simply ignore them, but we want to avoid those warnings. - file (READ ${FILE_PARSE}.c TEST_STREAM) - file (WRITE ${FILE_PARSE}.c " -#if defined __GNUC__ -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402\n -#pragma GCC diagnostic ignored \"-Wconversion\"\n -#pragma GCC diagnostic ignored \"-Wimplicit-function-declaration\"\n -#pragma GCC diagnostic ignored \"-Wlarger-than=\"\n -#pragma GCC diagnostic ignored \"-Wmissing-prototypes\"\n -#pragma GCC diagnostic ignored \"-Wnested-externs\"\n -#pragma GCC diagnostic ignored \"-Wold-style-definition\"\n -#pragma GCC diagnostic ignored \"-Wredundant-decls\"\n -#pragma GCC diagnostic ignored \"-Wsign-compare\"\n -#pragma GCC diagnostic ignored \"-Wsign-conversion\"\n -#pragma GCC diagnostic ignored \"-Wstrict-overflow\"\n -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"\n -#pragma GCC diagnostic ignored \"-Wsuggest-attribute=const\"\n -#pragma GCC diagnostic ignored \"-Wsuggest-attribute=pure\"\n -#pragma GCC diagnostic ignored \"-Wswitch-default\"\n -#pragma GCC diagnostic ignored \"-Wunused-function\"\n -#pragma GCC diagnostic ignored \"-Wunused-macros\"\n -#pragma GCC diagnostic ignored \"-Wunused-parameter\"\n -#endif\n -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600\n -#pragma GCC diagnostic ignored "-Wnull-dereference"\"\n -#endif\n -#elif defined __SUNPRO_CC\n -#pragma disable_warn\n -#elif defined _MSC_VER\n -#pragma warning(push, 1)\n -#endif\n - ") - file (APPEND ${FILE_PARSE}.c "${TEST_STREAM}") - message (STATUS "processed pragma in ${FILE_PARSE}") - file (READ ${GEN_DIR}/${FILE_PARSE}.h TEST_STREAM) - file (WRITE ${FILE_PARSE}.h "${TEST_STREAM}") -endif () - -if (FILE_ANALYZE) - # Add code that disables warnings in the flex/bison-generated code. - # - # Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions - # will simply ignore them, but we want to avoid those warnings. - file (READ ${GEN_DIR}/${FILE_ANALYZE} TEST_STREAM) - file (WRITE ${FILE_ANALYZE} " -#if defined __GNUC__ -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402\n -#pragma GCC diagnostic ignored \"-Wconversion\"\n -#pragma GCC diagnostic ignored \"-Wimplicit-function-declaration\"\n -#pragma GCC diagnostic ignored \"-Wlarger-than=\"\n -#pragma GCC diagnostic ignored \"-Wmissing-prototypes\"\n -#pragma GCC diagnostic ignored \"-Wnested-externs\"\n -#pragma GCC diagnostic ignored \"-Wold-style-definition\"\n -#pragma GCC diagnostic ignored \"-Wredundant-decls\"\n -#pragma GCC diagnostic ignored \"-Wsign-compare\"\n -#pragma GCC diagnostic ignored \"-Wsign-conversion\"\n -#pragma GCC diagnostic ignored \"-Wstrict-overflow\"\n -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"\n -#pragma GCC diagnostic ignored \"-Wsuggest-attribute=const\"\n -#pragma GCC diagnostic ignored \"-Wsuggest-attribute=pure\"\n -#pragma GCC diagnostic ignored \"-Wswitch-default\"\n -#pragma GCC diagnostic ignored \"-Wunused-function\"\n -#pragma GCC diagnostic ignored \"-Wunused-macros\"\n -#pragma GCC diagnostic ignored \"-Wunused-parameter\"\n -#endif\n -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600\n -#pragma GCC diagnostic ignored "-Wnull-dereference"\"\n -#endif\n -#elif defined __SUNPRO_CC\n -#pragma disable_warn\n -#elif defined _MSC_VER\n -#pragma warning(push, 1)\n -#endif\n - ") - file (APPEND ${FILE_ANALYZE} "${TEST_STREAM}") - message (STATUS "processed pragma in ${FILE_ANALYZE}") -endif () |