Răsfoiți Sursa

Merge pull request #6 from Silverteal/patch-2-patch-1

Patch 2 patch 1
Silverteal 2 ani în urmă
părinte
comite
5697dcf6e1
1 a modificat fișierele cu 11 adăugiri și 17 ștergeri
  1. 11 17
      .github/workflows/build.yml

+ 11 - 17
.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
@@ -34,9 +32,7 @@ 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
+      # Wap_Project_Directory: Plain Craft Launcher 2
       Configuration: ${{ matrix.configuration }}
       Version_Friendly_Name: ${{ matrix.name }}
 
@@ -46,21 +42,19 @@ 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
+      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
       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