Skip to content

Commit 3a626d0

Browse files
committed
CI 改为单独编译不同构建
1 parent e26f68f commit 3a626d0

2 files changed

Lines changed: 12 additions & 27 deletions

File tree

.github/workflows/build-and-package.yml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ env:
1515

1616
jobs:
1717
build-and-package:
18-
name: build-and-package
18+
name: build-and-package (${{ matrix.config }})
1919
runs-on: windows-2025-vs2026
20+
strategy:
21+
matrix:
22+
config: [x64, x86, ARM64]
2023

2124
env:
2225
Solution_Name: WinGetStore.slnx
@@ -48,35 +51,17 @@ jobs:
4851
- name: Setup MSBuild.exe
4952
uses: microsoft/setup-msbuild@v2
5053
with:
51-
msbuild-architecture: x64
54+
msbuild-architecture: ${{ matrix.config }}
5255

5356
# Restore the application to populate the obj folder with RuntimeIdentifiers
54-
- name: Restore the application (x64)
57+
- name: Restore the application
5558
run: msbuild $env:Solution_Name `
5659
/t:Restore `
5760
/p:Configuration=$env:Configuration `
5861
/p:Platform=$env:Platform
5962
env:
6063
Configuration: Release
61-
Platform: x64
62-
63-
- name: Restore the application (x86)
64-
run: msbuild $env:Solution_Name `
65-
/t:Restore `
66-
/p:Configuration=$env:Configuration `
67-
/p:Platform=$env:Platform
68-
env:
69-
Configuration: Release
70-
Platform: x86
71-
72-
- name: Restore the application (ARM64)
73-
run: msbuild $env:Solution_Name `
74-
/t:Restore `
75-
/p:Configuration=$env:Configuration `
76-
/p:Platform=$env:Platform
77-
env:
78-
Configuration: Release
79-
Platform: ARM64
64+
Platform: ${{ matrix.config }}
8065

8166
# Create the app package by building and packaging the Windows Application Packaging project
8267
- name: Create the app package
@@ -98,18 +83,18 @@ jobs:
9883
env:
9984
Build_ID: ${{ github.run_number }}
10085
Publisher_Name: CN=where
101-
Appx_Bundle: Always
102-
Appx_Bundle_Platforms: x64|x86|ARM64
86+
Appx_Bundle: Never
87+
Appx_Bundle_Platforms: ${{ matrix.config }}
10388
Appx_Package_Build_Mode: SideloadOnly
10489
Appx_Package_Dir: AppxPackages\
10590
Configuration: Release
106-
Platform: x64
91+
Platform: ${{ matrix.config }}
10792
Thumbprint: 0CDF4A03E9BE9DD789894BB3C7AD3DEDECD9AB25
10893
Password: ${{ secrets.Password }}
10994

11095
# Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
11196
- name: Upload build artifacts
11297
uses: actions/upload-artifact@v4
11398
with:
114-
name: MSIX Package
99+
name: MSIX Package (${{ matrix.config }})
115100
path: WinGetStore/AppxPackages/**

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PropertyGroup>
1313
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
1414
<AppxBundle>Never</AppxBundle>
15-
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
15+
<AppxBundlePlatforms>x86|x64|ARM64</AppxBundlePlatforms>
1616
<AppxPackageDir>AppPackages</AppxPackageDir>
1717
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
1818
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>

0 commit comments

Comments
 (0)