Skip to content

Commit 915c74c

Browse files
dovisutudovisutu
authored
CI: 修正Uploader生成参数 (#5746)
* Re-enable uploader caching 顺便把 Packer 和 Uploader 的版本升了一下 * fix
1 parent 760f649 commit 915c74c

4 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎.github/workflows/packer.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,32 @@ jobs:
3636
# 构造程序
3737
- name: Build Packer if not cached
3838
if: steps.cache-packer.outputs.cache-hit != 'true'
39-
run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64 -p:PublishSingleFile=true
39+
run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64
4040

41-
# build-uploader:
42-
# if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
43-
# name: Build / Cache Uploader
44-
# runs-on: windows-latest
45-
# steps:
46-
# - uses: actions/checkout@v4
47-
# with:
48-
# fetch-depth: 1
49-
# sparse-checkout: src
41+
build-uploader:
42+
if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
43+
name: Build / Cache Uploader
44+
runs-on: windows-latest
45+
steps:
46+
- uses: actions/checkout@v4
47+
with:
48+
fetch-depth: 1
49+
sparse-checkout: src
5050

51-
# # 缓存程序。一方面，在不同job之间需要这么做；另一方面，大约可以改善运行时间？
52-
# # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
53-
# - name: Cache Uploader
54-
# id: cache-uploader
55-
# uses: actions/cache@v4
56-
# with:
57-
# key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
58-
# path: Uploader.exe
59-
# lookup-only: true
51+
# 缓存程序。一方面，在不同job之间需要这么做；另一方面，大约可以改善运行时间？
52+
# actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
53+
- name: Cache Uploader
54+
id: cache-uploader
55+
uses: actions/cache@v4
56+
with:
57+
key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
58+
path: Uploader.exe
59+
lookup-only: true
6060

61-
# # 构造程序
62-
# - name: Build Uploader if not cached
63-
# if: steps.cache-uploader.outputs.cache-hit != 'true'
64-
# run: dotnet publish .\src\Uploader\Uploader.csproj -o ./ -r win-x64 -p:PublishSingeFile=true
61+
# 构造程序
62+
- name: Build Uploader if not cached
63+
if: steps.cache-uploader.outputs.cache-hit != 'true'
64+
run: dotnet publish .\src\Uploader\Uploader.csproj -o ./ -r win-x64
6565

6666
initialize-release:
6767
name: Initialize Release
@@ -284,17 +284,17 @@ jobs:
284284
upload:
285285
if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
286286
name: Upload Resource Packs to Remote Server
287-
needs: [ pack ] # 显然，需要打包完成，并且存在上传程序，才可以上传给分发服务器
287+
needs: [ pack, build-uploader ] # 显然，需要打包完成，并且存在上传程序，才可以上传给分发服务器
288288
runs-on: windows-latest
289289
steps:
290-
- uses: actions/checkout@v4
290+
- name: Restore Uploader
291+
id: cache-restore
292+
uses: actions/cache/restore@v4
291293
with:
292-
fetch-depth: 1
293-
sparse-checkout: src
294-
295-
# 构造程序
296-
- name: Build Uploader
297-
run: dotnet publish .\src\Uploader\Uploader.csproj -o ./ -r win-x64 -p:PublishSingeFile=true
294+
key: ${{ runner.os }}-Packer-${{ hashFiles('src/Uploader/**') }}
295+
path: |
296+
Uploader.exe
297+
fail-on-cache-miss: true # 前一步理应构造过的。如果不命中，肯定有问题，不如直接挂掉。
298298

299299
# 还原artifact（资源包）
300300
- name: Restore Artifacts

‎.github/workflows/pr-packer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# 构造程序
4040
- name: Build Packer if not cached
4141
if: steps.cache-packer.outputs.cache-hit != 'true'
42-
run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64 -p:PublishSingleFile=true
42+
run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64
4343

4444

4545
pack:

‎src/Packer/Packer.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
<AnalysisLevel>none</AnalysisLevel>
8+
<PublishSingleFile>true</PublishSingleFile>
89
</PropertyGroup>
910

1011
<ItemGroup>
11-
<PackageReference Include="LibGit2Sharp" Version="0.27.2" />
12-
<PackageReference Include="Serilog" Version="2.12.1-dev-01635" />
13-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00901" />
12+
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
13+
<PackageReference Include="Serilog" Version="4.3.0" />
14+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
1415
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
1516
</ItemGroup>
1617

‎src/Uploader/Uploader.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp5.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<PublishSingleFile>true</PublishSingleFile>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Neon.SSH.NET" Version="2.2.0" />
10-
<PackageReference Include="Serilog" Version="2.9.0" />
11-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00839" />
10+
<PackageReference Include="Neon.SSH.NET" Version="2.11.1" />
11+
<PackageReference Include="Serilog" Version="4.3.0" />
12+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
1213
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
1314
</ItemGroup>
1415

0 commit comments

Comments
 (0)