Merge pull request #683 from srz-zumix/develop

1.17.99.14

.ci/awesome_bot.sh

@@ -1,9 +1,15 @@
 #!/bin/bash
 
+if type awesome_bot >/dev/null 2>&1; then
+  AWESOME_BOT_EXEC="awesome_bot"
+else
+  AWESOME_BOT_EXEC="bundle exec awesome_bot"
+fi
+
 awesome_bot_with_retry() {
   local attempt_max=5
   local -i attempt_num=1
-  until awesome_bot "$@"; do
+  until ${AWESOME_BOT_EXEC} "$@"; do
       if ((attempt_num == attempt_max)); then
           exit 1
       fi

.github/workflows/awesome-bot.yml

@@ -10,16 +10,23 @@ on:
 name: AsesomeBot
 jobs:
   check:
-    runs-on: ubuntu-latest
+    # act の場合 github.ref_protected がないのでそれを利用
+    # act の image に libssl1.1 が入ってないので 20.04 を使う
+    runs-on: ${{ (github.ref_protected == null && 'ubuntu-20.04') || 'ubuntu-latest' }}
     env:
       ASESOME_BOT_OPTION: --allow-redirect --allow-ssl --allow-dupe -t 60
     steps:
       - uses: actions/checkout@v3
+      - name: Create Gemfile
+        run: |
+          {
+            echo 'source "http://rubygems.org"'
+            echo "gem 'awesome_bot'"
+          } > Gemfile
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-      - name: install
-        run: gem install awesome_bot
+          ruby-version: 3.1
+          bundler-cache: true
       - name: check
         run: |
           # shellcheck disable=SC2086

.github/workflows/codeql-analysis.yml

@@ -25,6 +25,10 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    # jobs.*.if では env 参照できない
+    # act の場合 github.ref_protected がないのでそれを利用
+    # act では実行しない
+    if: github.ref_protected != null
 
     strategy:
       fail-fast: false

.github/workflows/coverage.yml

@@ -24,11 +24,15 @@ on:
 jobs:
   codecov:
     runs-on: ubuntu-latest
+    # jobs.*.if では env 参照できない
+    # act の場合 github.ref_protected がないのでそれを利用
+    # act では実行しない
+    if: github.ref_protected != null
     env:
       USE_COVERAGE: gcov
       DEFS: -DIUTEST_FORCE_COLORCONSOLE=1
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: info
       run: |
         make -C test showcxxmacros
@@ -44,7 +48,7 @@ jobs:
     - name: test
       run: |
         make -C test test
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: test-result
         path: test/*.xml
@@ -58,10 +62,14 @@ jobs:
 
   coveralls:
     runs-on: ubuntu-latest
+    # jobs.*.if では env 参照できない
+    # act の場合 github.ref_protected がないのでそれを利用
+    # act では実行しない
+    if: github.ref_protected != null
     env:
       USE_COVERAGE: lcov
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: install dependencies
       run: |
         sudo apt-get install -qq -y lcov
@@ -80,7 +88,7 @@ jobs:
     - name: test
       run: |
         make -C test test
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: test-result
         path: test/*.xml

.github/workflows/gtest-compat.yml

@@ -16,6 +16,9 @@ on:
       - '*.yaml'
       - '.circleci/**'
       - '.semaphore/**'
+      - '.github/**'
+      - '!.github/workflows/gtest-compat.yml'
+      - 'docs/**'
   push:
     branches:
       - master
@@ -38,8 +41,13 @@ jobs:
       matrix:
         include:
           - gtest-version: "latest"
-            GTEST_EXPECT_VER: 0x01110000
+            GTEST_EXPECT_VER: 0x01120100
             GTEST_EXPECT_LATEST: 1
+          - gtest-version: "release-1.12.1"
+            # 1.12.1 only change the version number
+            GTEST_EXPECT_VER: 0x01120000
+          - gtest-version: "release-1.12.0"
+            GTEST_EXPECT_VER: 0x01120000
           - gtest-version: "release-1.11.0"
             GTEST_EXPECT_VER: 0x01110000
           - gtest-version: "release-1.10.0"

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
         run: |
           echo "${GITHUB_EVENT_CONTEXT}" > github_event.json
       - name: store event
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: github_event.json
           path: github_event.json
@@ -187,7 +187,7 @@ jobs:
   #       if: always()
 
   zapcc-basic-test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: prepare
     container:
       image: docker://srzzumix/zapcc:bionic

.github/workflows/metrics.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   prepare:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
     if: >
@@ -32,17 +32,17 @@ jobs:
           echo "$HEAD_COMMIT_MESSAGE"
 
   fused:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: prepare
     steps:
     - uses: actions/checkout@v3
     - name: fused
       id: fused
       run: |
         make -C tools/fused
-        echo "##[set-output name=size;]$(wc -c < fused-src/iutest.hpp)"
-        echo "##[set-output name=min_size;]$(wc -c < fused-src/iutest.min.hpp)"
-        echo "##[set-output name=wandbox_min_size;]$(wc -c < fused-src/iutest.wandbox.min.hpp)"
+        echo "size=$(wc -c < fused-src/iutest.hpp)" >> "${GITHUB_OUTPUT}"
+        echo "min_size=$(wc -c < fused-src/iutest.min.hpp)" >> "${GITHUB_OUTPUT}"
+        echo "wandbox_min_size=$(wc -c < fused-src/iutest.wandbox.min.hpp)" >> "${GITHUB_OUTPUT}"
     - name: send metrics
       run: |
         curl \
@@ -63,7 +63,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
   lizard:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: login
     steps:
     - uses: actions/checkout@v3
@@ -72,7 +72,7 @@ jobs:
       with:
         args: -o lizard.html --html ./include
     - name: Archive code metrics results
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v3
       with:
         name: lizard.html
         path: lizard.html

.github/workflows/reviewdog.yml

@@ -54,3 +54,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: reviewdog/action-actionlint@v1
+        with:
+          reporter: github-pr-review
+
+  hadolint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: hadolint
+        uses: reviewdog/action-hadolint@v1
+        with:
+          reporter: github-pr-review

Makefile

@@ -15,7 +15,7 @@ fused: ## create fused src
 	make -C tools/fused
 
 editorconfig-self-lint:
-	make -C tools/python editorconfig
+	make -C tools/python editorconfig-self-lint
 
 DAGGER_OPTS:=--log-format=plain
 dagger-ctest:

appveyor.yml

@@ -217,12 +217,12 @@ for:
   install:
     cmd: |
       curl -sSL -o %CYGWIN_PATH%\%CYGWIN_SETUP_EXE% "https://cygwin.com/%CYGWIN_SETUP_EXE%"
-      %CYGWIN_PATH%\%CYGWIN_SETUP_EXE% -qnNdO -R %CYGWIN_PATH% -s http://cygwin.mirror.constant.com -l %CYGWIN_PATH%/var/cache/setup -P make -P clang
+      %CYGWIN_PATH%\%CYGWIN_SETUP_EXE% -qnNdO --allow-unsupported-windows -R %CYGWIN_PATH% -s http://cygwin.mirror.constant.com -l %CYGWIN_PATH%/var/cache/setup -P make -P clang
   before_build: *noop
   build_script:
     cmd: |
       cd test
-      make showcxxmacros showstdlbfeatures
+      make showcxxmacros check_stdlib showstdlbfeatures
       make -j4 OUTPUTXML=%OUTPUTXML_TYPE%
   test_script:
     cmd: make test OUTPUTXML=%OUTPUTXML_TYPE% && make report
@@ -256,7 +256,7 @@ for:
   build_script:
     cmd: |
       cd test
-      mingw32-make showcxxversion showcxxmacros showstdlbfeatures
+      mingw32-make showcxxversion showcxxmacros check_stdlib showstdlbfeatures
       mingw32-make -j4 %MAKE_OPTIONS% OUTPUTXML=%OUTPUTXML_TYPE%
   test_script:
     cmd: mingw32-make test %MAKE_OPTIONS% OUTPUTXML=%OUTPUTXML_TYPE% && mingw32-make report
@@ -269,7 +269,7 @@ for:
   before_build:
     cmd: |
       "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd.bat"
-      cd test && nmake showcxxmacros showstdlbfeatures
+      cd test && nmake showcxxmacros check_stdlib showstdlbfeatures
       nmake minimum_tests && minimum_tests.exe --spec
       nmake clean
   build_script:

codefresh.yml

@@ -38,6 +38,7 @@ steps:
       - cf_export GGC_MIN_EXPAND=4
       - cf_export GGC_MIN_HEAPSIZ=32768
       - cf_export CI_NODEBUG=1
+      - cf_export NO_TESTDATA=1
       - make -C test clean
       - make -C test prepare
     when: *skip_condition

docs/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = iutest
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.17.99.13
+PROJECT_NUMBER         = 1.17.99.14
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/gtest/iutest_gmock_ver.hpp

@@ -26,9 +26,11 @@
 
 //!< Minor Version
 #ifndef GMOCK_MINORVER
-#  if   defined(GTEST_FLAG_GET)
-#    define GMOCK_MINORVER  0x11
+#  if   defined(GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_)
+#    define GMOCK_MINORVER  0x12
 #    define GMOCK_LATEST    1
+#  elif defined(GTEST_FLAG_GET)
+#    define GMOCK_MINORVER  0x11
 #  elif defined(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT)
 #    define GMOCK_MINORVER  0x11
 #  elif defined(GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_)
@@ -52,7 +54,9 @@
 
 //!< Micro Version
 #ifndef GMOCK_MICROVER
-#  if   GMOCK_MINORVER == 0x08 && !defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)
+#  if   GMOCK_MINORVER == 0x12 && defined(GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_)
+#    define GMOCK_MICROVER  0x01
+#  elif GMOCK_MINORVER == 0x08 && !defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)
 #    define GMOCK_MICROVER  0x01
 #  endif
 #endif

include/gtest/iutest_gtest_ver.hpp

@@ -27,9 +27,11 @@
 
 //!< Minor Version
 #ifndef GTEST_MINORVER
-#  if   defined(GTEST_FLAG_GET)
-#    define GTEST_MINORVER  0x11
+#  if   defined(GTEST_HAVE_ATTRIBUTE_)
+#    define GTEST_MINORVER  0x12
 #    define GTEST_LATEST    1
+#  elif defined(GTEST_FLAG_GET)
+#    define GTEST_MINORVER  0x12
 #  elif defined(GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_)
 #    define GTEST_MINORVER  0x11
 #  elif defined(GTEST_SKIP)
@@ -57,7 +59,9 @@
 
 //!< Micro Version
 #ifndef GTEST_MICROVER
-#  if   GTEST_MINORVER == 0x08 && defined(GTEST_STRINGIFY_)
+#  if   GTEST_MINORVER == 0x12 && defined(GTEST_HAVE_ATTRIBUTE_)
+#    define GTEST_MICROVER    0x01
+#  elif GTEST_MINORVER == 0x08 && defined(GTEST_STRINGIFY_)
 #    define GTEST_MICROVER    0x01
 #  elif GTEST_MINORVER == 0x02 && defined(GTEST_HAS_CLONE)
 #    define GTEST_MICROVER  0x01

include/gtest/switch/iutest_switch_assertion_return.hpp

@@ -125,7 +125,8 @@ class AssertHelperEx : public AssertHelper
         return fixed.ret.value;
     }
 private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperEx);
+    AssertHelperEx(const AssertHelperEx&);
+    AssertHelperEx& operator = (const AssertHelperEx&);
 };
 
 }   // end of namespace internal