From 27264e16cbdce0a11d9cc3899ad7b19a21d3c263 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:52:50 +0800 Subject: [PATCH 1/8] Update build.yml --- .github/workflows/build.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad190ca..64d20de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,6 @@ jobs: runs-on: windows-latest env: - Solution_Name: Plain Craft Launcher 2.sln Wap_Project_Directory: Plain Craft Launcher 2 Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj Configuration: ${{ matrix.configuration }} @@ -46,19 +45,14 @@ jobs: with: fetch-depth: 0 - # setup msbuild - - name: 安装 MSBuild + - name: 配置 MSBuild uses: microsoft/setup-msbuild@v2 + with: + msbuild-architecture: x64 - # # Restore the application to populate the obj folder with RuntimeIdentifiers - # - name: Restore the application - # run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration - - # Create the app package by building and packaging the Windows Application Packaging project - name: 编译源代码 run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /t:Rebuild - - # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact + - name: 上传编译产物 uses: actions/upload-artifact@v4 with: From 3f9ba48749478cdabf750f8ddabbf113f9dbc699 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:54:20 +0800 Subject: [PATCH 2/8] Update build.yml --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64d20de..2e09f3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,12 +3,10 @@ name: 构建 PCL on: push: paths: - - 'Plain Craft Launcher 2.sln' - 'Plain Craft Launcher 2/**' - '.github/workflows/**' pull_request: paths: - - 'Plain Craft Launcher 2.sln' - 'Plain Craft Launcher 2/**' - '.github/workflows/**' workflow_dispatch: @@ -20,7 +18,7 @@ jobs: strategy: matrix: include: - - name: 调试版 + - name: 可调试开发版 configuration: Debug - name: 开发版 configuration: Snapshot From 3aab7ead7a809ab6d2b48eb689edf526ef5fd82d Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:57:41 +0800 Subject: [PATCH 3/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e09f3f..8ffc491 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: runs-on: windows-latest env: - Wap_Project_Directory: Plain Craft Launcher 2 + # Wap_Project_Directory: Plain Craft Launcher 2 Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj Configuration: ${{ matrix.configuration }} Version_Friendly_Name: ${{ matrix.name }} @@ -55,4 +55,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ env.Version_Friendly_Name }} - path: ${{ env.Wap_Project_Directory }}\obj\${{ env.Configuration }}\Plain Craft Launcher 2.exe + path: Plain Craft Launcher 2\obj\${{ env.Configuration }}\Plain Craft Launcher 2.exe From 941a111749d81566e3fe197e5753a1914bd64364 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:01:12 +0800 Subject: [PATCH 4/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ffc491..45e51da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: env: # Wap_Project_Directory: Plain Craft Launcher 2 - Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj + # Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj Configuration: ${{ matrix.configuration }} Version_Friendly_Name: ${{ matrix.name }} @@ -49,7 +49,7 @@ jobs: msbuild-architecture: x64 - name: 编译源代码 - run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /t:Rebuild + run: msbuild Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj /p:Configuration=$env:Configuration /t:Rebuild - name: 上传编译产物 uses: actions/upload-artifact@v4 From af3737df1eb2d8c3501a5dcfa3b9f367f48a02bc Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:04:45 +0800 Subject: [PATCH 5/8] Update build.yml --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45e51da..d2e43b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,6 @@ jobs: env: # Wap_Project_Directory: Plain Craft Launcher 2 - # Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj Configuration: ${{ matrix.configuration }} Version_Friendly_Name: ${{ matrix.name }} @@ -48,8 +47,11 @@ jobs: with: msbuild-architecture: x64 + # 由于路径包含空格,使用环境变量传入路径,避免令人疑惑的引号写法 - name: 编译源代码 - run: msbuild Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj /p:Configuration=$env:Configuration /t:Rebuild + run: msbuild $Path /p:Configuration=$env:Configuration /t:Rebuild + env: + Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj - name: 上传编译产物 uses: actions/upload-artifact@v4 From 36a71e035b683977b599b64b3e3a6fb853a036ae Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:28:24 +0800 Subject: [PATCH 6/8] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2e43b6..fbd0e57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: # 由于路径包含空格,使用环境变量传入路径,避免令人疑惑的引号写法 - name: 编译源代码 - run: msbuild $Path /p:Configuration=$env:Configuration /t:Rebuild + run: msbuild $env:Path /p:Configuration=$env:Configuration /t:Rebuild env: Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj From 937f947d7144accb3bf039f65752fb8c435f75b9 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:43:48 +0800 Subject: [PATCH 7/8] Update build.yml --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbd0e57..751c2cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: env: # Wap_Project_Directory: Plain Craft Launcher 2 + Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj Configuration: ${{ matrix.configuration }} Version_Friendly_Name: ${{ matrix.name }} @@ -50,8 +51,8 @@ jobs: # 由于路径包含空格,使用环境变量传入路径,避免令人疑惑的引号写法 - name: 编译源代码 run: msbuild $env:Path /p:Configuration=$env:Configuration /t:Rebuild - env: - Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj + # env: + # - name: 上传编译产物 uses: actions/upload-artifact@v4 From e4ecc79bc97fab00d119c230110f0c4d62365ea2 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:54:17 +0800 Subject: [PATCH 8/8] Update build.yml --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 751c2cf..d4272e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,6 @@ jobs: env: # Wap_Project_Directory: Plain Craft Launcher 2 - Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj Configuration: ${{ matrix.configuration }} Version_Friendly_Name: ${{ matrix.name }} @@ -50,9 +49,9 @@ jobs: # 由于路径包含空格,使用环境变量传入路径,避免令人疑惑的引号写法 - name: 编译源代码 - run: msbuild $env:Path /p:Configuration=$env:Configuration /t:Rebuild - # env: - # + run: msbuild $env:Project_Path /p:Configuration=$env:Configuration /t:Rebuild + env: + Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj - name: 上传编译产物 uses: actions/upload-artifact@v4