From 79ad9c54d561746d31acfc02bd3f380cfbff7c87 Mon Sep 17 00:00:00 2001 From: charonxin <1656746727@qq.com> Date: Tue, 15 Aug 2023 20:50:00 +0800 Subject: [PATCH 1/3] trigger --- System/config_l1.h.xmake | 1 + 1 file changed, 1 insertion(+) diff --git a/System/config_l1.h.xmake b/System/config_l1.h.xmake index 20b8df2eb..c97dfac64 100644 --- a/System/config_l1.h.xmake +++ b/System/config_l1.h.xmake @@ -5,6 +5,7 @@ ${define HAVE_TIME_T} ${define HAVE_GETTIMEOFDAY} ${define __FreeBSD__} ${define OS_SUN} +${define OS_MACOSX} #ifdef HAVE_INTPTR_T #ifdef HAVE_INTTYPES_H From 89347272abeeef6d4b80e1046660dda896411338 Mon Sep 17 00:00:00 2001 From: charonxin <1656746727@qq.com> Date: Tue, 15 Aug 2023 20:53:32 +0800 Subject: [PATCH 2/3] trigger --- System/Classes/tm_timer.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/System/Classes/tm_timer.hpp b/System/Classes/tm_timer.hpp index b7a718741..38f466f38 100644 --- a/System/Classes/tm_timer.hpp +++ b/System/Classes/tm_timer.hpp @@ -17,7 +17,7 @@ #ifndef __FreeBSD__ #ifndef HAVE_TIME_T #define HAVE_TIME_T -#if (defined OS_SUN || defined OS_LINUX || defined OS_MAXOSX) +#if (defined OS_SUN || defined OS_LINUX || defined OS_MACOSX) typedef long time_t; #endif #endif From 6aa2a55121f10acc56dd2928400ddfec1da30358 Mon Sep 17 00:00:00 2001 From: charonxin <1656746727@qq.com> Date: Tue, 15 Aug 2023 20:57:26 +0800 Subject: [PATCH 3/3] don't use cache --- .github/workflows/ci-xmake-macos.yml | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-xmake-macos.yml b/.github/workflows/ci-xmake-macos.yml index ff894bded..d89ae2287 100644 --- a/.github/workflows/ci-xmake-macos.yml +++ b/.github/workflows/ci-xmake-macos.yml @@ -25,13 +25,13 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: cache xmake - uses: actions/cache@v2 - with: - path: | - ${{github.workspace}}/build/.build_cache - /Users/runner/.xmake - key: ${{ runner.os }}-xmake-${{ hashFiles('**/xmake.lua') }} + # - name: cache xmake + # uses: actions/cache@v2 + # with: + # path: | + # ${{github.workspace}}/build/.build_cache + # /Users/runner/.xmake + # key: ${{ runner.os }}-xmake-${{ hashFiles('**/xmake.lua') }} - name: set XMAKE_GLOBALDIR run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV @@ -39,21 +39,21 @@ jobs: - uses: xmake-io/github-action-setup-xmake@v1 with: xmake-version: v2.8.1 - actions-cache-folder: '.xmake-cache' + # actions-cache-folder: '.xmake-cache' - name: xmake repo --update run: xmake repo --update - - name: cache - uses: actions/cache@v3 - with: - path: | - ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - ${{ runner.workspace }}/build/.build_cache - key: ${{ runner.os }}-xmake-qt${{ matrix.qt_ver }}-${{ hashFiles('**/xmake.lua') }} + # - name: cache + # uses: actions/cache@v3 + # with: + # path: | + # ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages + # ${{ runner.workspace }}/build/.build_cache + # key: ${{ runner.os }}-xmake-qt${{ matrix.qt_ver }}-${{ hashFiles('**/xmake.lua') }} - name: config - run: xmake config --policies=build.ccache -o ${{ runner.workspace }}/build --yes -vD + run: xmake config -o ${{ runner.workspace }}/build --yes -vD - name: build run: xmake build --yes -vD - name: test