Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c10f81e

Browse files
rmbadminrmbadmin
committed
fix CI
1 parent b2b950b commit c10f81e

2 files changed

Lines changed: 18 additions & 15 deletions

File tree

‎.github/workflows/publish.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ jobs:
6161
- name: Build AvaloniaApp
6262
run: dotnet build ./src/ST.Client.Desktop.Avalonia.App/ST.Client.Avalonia.App.csproj -c "${{ env.Configuration }}"
6363

64+
- name: Build ST.Tools.Publish Release
65+
run: dotnet build ./src/ST.Tools.Publish/ST.Tools.Publish.csproj -c Release
66+
6467
- name: Run CommonUnit
6568
run: dotnet test ./tests/Common.UnitTest/Common.UnitTest.csproj -c "${{ env.Configuration }}"
6669

@@ -102,71 +105,71 @@ jobs:
102105
run: |
103106
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
104107
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_win_x64_fde_v${{ steps.tag.outputs.tag }}.7z C:\PublishFiles
105-
echo "fd_win_x64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_win_x64_fde_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
108+
echo "fd_win_x64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_win_x64_fde_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
106109
107110
- name: Package win-x64
108111
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
109112
shell: pwsh
110113
run: |
111114
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
112115
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_win_x64_v${{ steps.tag.outputs.tag }}.7z C:\PublishFiles
113-
echo "win_x64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_win_x64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
116+
echo "win_x64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_win_x64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
114117
115118
- name: Package osx-64
116119
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
117120
shell: pwsh
118121
run: |
119122
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
120123
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_macos_x64_v${{ steps.tag.outputs.tag }}.7z C:\PublishFiles
121-
echo "macos_x64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_macos_x64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
124+
echo "macos_x64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_macos_x64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
122125
123126
- name: Package linux-x64 7z
124127
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
125128
shell: pwsh
126129
run: |
127130
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
128131
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.7z C:\PublishFiles
129-
echo "linux_x64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
132+
echo "linux_x64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
130133
131134
- name: Package linux-arm64 7z
132135
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
133136
shell: pwsh
134137
run: |
135138
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
136139
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.7z C:\PublishFiles
137-
echo "linux_arm64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
140+
echo "linux_arm64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
138141
139142
- name: Package linux-x64 deb
140143
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
141144
shell: pwsh
142145
run: |
143146
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
144147
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.deb C:\PublishFiles
145-
echo "deb_linux_arm64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.deb)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
148+
echo "deb_linux_arm64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.deb)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
146149
147150
- name: Package linux-arm64 deb
148151
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
149152
shell: pwsh
150153
run: |
151154
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
152155
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.deb C:\PublishFiles
153-
echo "deb_linux_arm64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.deb)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
156+
echo "deb_linux_arm64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.deb)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
154157
155158
- name: Package linux-x64 rpm
156159
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
157160
shell: pwsh
158161
run: |
159162
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
160163
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.rpm C:\PublishFiles
161-
echo "rpm_linux_arm64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.rpm)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
164+
echo "rpm_linux_arm64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_x64_v${{ steps.tag.outputs.tag }}.rpm)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
162165
163166
- name: Package linux-arm64 rpm
164167
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
165168
shell: pwsh
166169
run: |
167170
New-Item -ItemType Directory -Path C:\PublishFiles -Force > $null
168171
copy .\src\ST.Client.Desktop.Avalonia.App\bin\$env:Configuration\Publish\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.rpm C:\PublishFiles
169-
echo "rpm_linux_arm64_SHA256=$(.\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.rpm)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
172+
echo "rpm_linux_arm64_SHA256=$(.\packaging\GetSHA256.ps1 C:\PublishFiles\$env:ProjectName_linux_arm64_v${{ steps.tag.outputs.tag }}.rpm)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
170173
171174
172175
- name: Create a new GitHub release

‎packaging/build.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $output_dir = "$RootPath\src\ST.Client.Desktop.Avalonia.App\bin\$configuration\P
99
$proj_path = "$RootPath\src\ST.Client.Desktop.Avalonia.App\ST.Client.Avalonia.App.csproj"
1010

1111
$publishtool_dir = "$RootPath\src\ST.Tools.Publish"
12-
$publishtool_exe = "$publishtool_dir\bin\$configuration\$publishtool_tfm\p.exe"
12+
$publishtool_exe = "$publishtool_dir\bin\Release\net6.0\p.exe"
1313

1414
$build_pubxml_dir = "$RootPath\src\ST.Client.Desktop.Avalonia.App\Properties\PublishProfiles"
1515

@@ -21,9 +21,11 @@ $build_pubxml_linuxarm64 = "linux-arm64.pubxml"
2121

2222
function Build-PublishTool
2323
{
24-
dotnet build -c Release $publishtool_dir\ST.Tools.Publish.csproj
25-
26-
if ($LASTEXITCODE) { exit $LASTEXITCODE }
24+
if(-Not Test-Path $publishtool_exe)
25+
{
26+
dotnet build -c Release -f $publishtool_tfm $publishtool_dir\ST.Tools.Publish.csproj
27+
if ($LASTEXITCODE) { exit $LASTEXITCODE }
28+
}
2729

2830
$dev=''
2931
if($configuration -eq 'Debug')
@@ -32,7 +34,6 @@ function Build-PublishTool
3234
}
3335

3436
& $publishtool_exe -ver -token $env:Token $dev
35-
3637
if ($LASTEXITCODE) { exit $LASTEXITCODE }
3738

3839
# build App
@@ -43,7 +44,6 @@ function Build-PublishTool
4344
Build-App linux-arm64
4445

4546
& $publishtool_exe -full -token $env:Token $dev
46-
4747
if ($LASTEXITCODE) { exit $LASTEXITCODE }
4848
}
4949

0 commit comments

Comments
 (0)