Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

trigger #55

Closed
wants to merge 3 commits into from
Closed

trigger #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79ad9c5
trigger
Charonxin Aug 15, 2023
8934727
trigger
Charonxin Aug 15, 2023
6aa2a55
don't use cache
Charonxin Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/ci-xmake-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,35 @@ 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

- 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
Expand Down
2 changes: 1 addition & 1 deletion System/Classes/tm_timer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions System/config_l1.h.xmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading