Skip to content

Commit ae609c0

Browse files
MoonL79da-liii
authored andcommitted
!1205 [200_38] 调整 Github Action以解决 macOS 13 runner过期的问题
1 parent 06fdabc commit ae609c0

File tree

7 files changed

+20
-167
lines changed

7 files changed

+20
-167
lines changed

.github/workflows/cd_on_macos_arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: config
4242
run: xmake config -m release -a ${{ matrix.arch }} -vD --yes
4343
- name: build
44-
run: xmake build -vD --diagnosis stem
44+
run: xmake build -vD stem
4545
- name: install
4646
run: xmake install -vD stem
4747
- name: Clean up mounted DMGs

.github/workflows/cd_on_macos_x64.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

.github/workflows/ci-macos-arm64.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
path: |
4646
${{github.workspace}}/build/.build_cache
4747
/Users/runner/.xmake
48-
key: xmake-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake-requires.lock') }}
48+
key: xmake-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake/vars.lua') }}
4949

5050
- name: Set Qt Environment Variables
5151
run: |
@@ -71,14 +71,14 @@ jobs:
7171
with:
7272
path: |
7373
${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
74-
key: xrepo-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake-requires.lock') }}
74+
key: xrepo-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake/vars.lua') }}
7575

7676
- name: cache xmake
7777
uses: actions/cache@v3
7878
with:
7979
path: |
8080
${{ runner.workspace }}/build/.build_cache
81-
key: xmake-build-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake-requires.lock') }}
81+
key: xmake-build-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake/vars.lua') }}
8282

8383
- name: config
8484
run: xmake config --policies=build.ccache -o ${{ runner.workspace }}/build -m releasedbg --yes

.github/workflows/ci-xmake-macos.yml

Lines changed: 0 additions & 90 deletions
This file was deleted.

.github/workflows/ci-xmake-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ jobs:
5656
with:
5757
path: |
5858
${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
59-
key: qt683-${{ runner.os }}-${{ runner.arch }}-xrepo-${{ hashFiles('xmake-requires.lock') }}
59+
key: qt683-${{ runner.os }}-${{ runner.arch }}-xrepo-${{ hashFiles('xmake/vars.lua') }}
6060
- name: cache xmake
6161
uses: actions/cache@v4
6262
with:
6363
path: |
6464
${{ github.workspace }}/build/.build_cache
65-
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('xmake-requires.lock') }}
65+
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('xmake/vars.lua') }}
6666
- name: config
6767
run: xmake config --policies=build.ccache --yes -vD -m releasedbg --plat=windows
6868
- name: build

devel/200_38.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# [200_38] 将墨干的 CI/CD 的 xmake 统一到 xmake 3.0.4
22

3+
## 2025/12/10 修改yml文件
4+
### What
5+
+ 删除 macOS-x64 平台 CI/CD 文件,放弃对 macOS-x64 平台的支持。
6+
+ 修改 macOS-arm64 平台的 CI/CD 文件,将系统版本改为 macos-14。
7+
+ 修改 macOS 平台与 Windows 平台的 CI 文件,修复依赖于已删除文件的问题,将依赖项改为vars.lua文件。
8+
+ 修改 xmake.lua 文件,修复 install 过程中错误的运行步骤。
9+
+ 删除无效参数。
10+
311
## 2025/12/10 修改macOS的CICD文件使用的系统版本
412

513
## 2025/12/05 将 macOSarm64 平台的 CD 配置文件的 xmake 版本改回 v2.9.3

xmake.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,9 @@ target("QWKCore")
458458
-- Set install headers
459459
add_headerfiles("$(buildir)/include/QWKCore/**.h", {prefixdir = "QWKCore"})
460460
add_headerfiles("$(buildir)/include/QWKCore/private/**.h", {prefixdir = "QWKCore/private"})
461+
462+
on_install(function (target)
463+
end)
461464
target_end()
462465

463466
target("QWKWidgets")
@@ -545,6 +548,9 @@ target("QWKWidgets")
545548

546549
-- Set install headers
547550
add_headerfiles("$(buildir)/include/QWKWidgets/**.h", {prefixdir = "QWKWidgets"})
551+
552+
on_install(function (target)
553+
end)
548554
target_end()
549555

550556
target("libmogan") do

0 commit comments

Comments
 (0)