From b92a77ef82358d8b9bc12774b4bcb5bce942a00a Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Thu, 19 Dec 2024 11:00:56 +0900 Subject: [PATCH 1/2] add actions entries. --- .github/workflows/actions.yml | 88 +++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 653a72c3..64cc295e 100644 --- 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: From b43c69e683895460bfabdd21e1cf539a862ea720 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Thu, 19 Dec 2024 11:11:07 +0900 Subject: [PATCH 2/2] update macro. --- src/tglobal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tglobal.h b/src/tglobal.h index 44d2c253..6416b6c6 100644 --- a/src/tglobal.h +++ b/src/tglobal.h @@ -9,7 +9,7 @@ constexpr auto TF_SRC_REVISION = 2956; #include -#if (!defined(Q_OS_WIN) && (defined(__cpp_lib_format) || __has_include())) || (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