Merge pull request #412 from treefrogframework/actions5

Add actions entries
treefrogframework · Dec 19, 2024 · d25197f · d25197f
2 parents 01154cc + b43c69e
commit d25197f
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 1 deletion.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -266,6 +266,94 @@ jobs:
       run: |
         ./releasetest
 
+  build-macos14:
+    runs-on: macos-14
+    steps:
+    - uses: actions/checkout@main
+    - name: Homebrew
+      run: |
+        which pkg-config || brew install pkg-config
+        brew install qt6 jq mongo-c-driver gflags glog lz4
+    - name: configure for debug
+      run: |
+        ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 --enable-debug
+    - name: build for debug
+      run: |
+        make -j4 -C src
+        sudo make -C src install
+        make -j4 -C tools
+        sudo make -C tools install
+    - name: configure
+      run: |
+        ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4
+    - name: build
+      run: |
+        make -j4 -C src
+        sudo make -C src install
+        make -j4 -C tools
+        sudo make -C tools install
+    - name: version
+      run: |
+        treefrog -v
+        tspawn --show-drivers
+    - name: brew install for test
+      run: |
+        brew install redis memcached
+        brew services start redis
+        brew services start memcached
+    - name: testall.sh
+      working-directory: src/test
+      run: |
+        ./testall.sh
+    - name: releasetest
+      working-directory: tools/test/releasetest
+      run: |
+        ./releasetest
+
+  build-macos13:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@main
+    - name: Homebrew
+      run: |
+        which pkg-config || brew install pkg-config
+        brew install qt6 jq mongo-c-driver gflags glog lz4
+    - name: configure for debug
+      run: |
+        ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 --enable-debug
+    - name: build for debug
+      run: |
+        make -j4 -C src
+        sudo make -C src install
+        make -j4 -C tools
+        sudo make -C tools install
+    - name: configure
+      run: |
+        ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4
+    - name: build
+      run: |
+        make -j4 -C src
+        sudo make -C src install
+        make -j4 -C tools
+        sudo make -C tools install
+    - name: version
+      run: |
+        treefrog -v
+        tspawn --show-drivers
+    - name: brew install for test
+      run: |
+        brew install redis memcached
+        brew services start redis
+        brew services start memcached
+    - name: testall.sh
+      working-directory: src/test
+      run: |
+        ./testall.sh
+    - name: releasetest
+      working-directory: tools/test/releasetest
+      run: |
+        ./releasetest
+
   build-windows-qt68-msvc2022:
     runs-on: windows-latest
     steps:

diff --git a/src/tglobal.h b/src/tglobal.h
@@ -9,7 +9,7 @@ constexpr auto TF_SRC_REVISION = 2956;
 #include <version>
 
 
-#if (!defined(Q_OS_WIN) && (defined(__cpp_lib_format) || __has_include(<format>))) || (defined(_MSC_VER) && _MSC_VER >= 1930)  // std::format
+#if (!defined(Q_OS_WIN) && defined(__cpp_lib_format)) || (defined(_MSC_VER) && _MSC_VER >= 1930)  // std::format
 #define TF_HAVE_STD_FORMAT
 #endif