From cdee33f44cd8235822b26c9e58c27131de87f4e5 Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Thu, 21 Jul 2022 17:49:57 +0800 Subject: [PATCH] fix CI --- .github/workflows/dotnet.yml | 4 ++-- .github/workflows/publish.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index c6f625c28..ed16c35e7 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -150,7 +150,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: '[${{ matrix.configuration }}]${{ env.ProjectName }}_win_x86_fde_${{ env.GITHUB_SHA_SHORT }}' - path: src\ST.Client.Desktop.Avalonia.App\bin\${{ matrix.configuration }}\Publish\${{ env.ProjectName }}_win_x64_fde_${{ env.GITHUB_SHA_SHORT }}.7z + path: src\ST.Client.Desktop.Avalonia.App\bin\${{ matrix.configuration }}\Publish\${{ env.ProjectName }}_win_x86_fde_${{ env.GITHUB_SHA_SHORT }}.7z - name: Upload win-x86 App ${{ matrix.configuration }} continue-on-error: true @@ -158,7 +158,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: '[${{ matrix.configuration }}]${{ env.ProjectName }}_win_x86_${{ env.GITHUB_SHA_SHORT }}' - path: src\ST.Client.Desktop.Avalonia.App\bin\${{ matrix.configuration }}\Publish\${{ env.ProjectName }}_win_x64_${{ env.GITHUB_SHA_SHORT }}.7z + path: src\ST.Client.Desktop.Avalonia.App\bin\${{ matrix.configuration }}\Publish\${{ env.ProjectName }}_win_x86_${{ env.GITHUB_SHA_SHORT }}.7z - name: Upload macos-x64 App ${{ matrix.configuration }} continue-on-error: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index efbc95216..ea9f90bb1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -158,6 +158,38 @@ jobs: Copy-Item ".\src\ST.Client.Desktop.Avalonia.App\bin\${env:Configuration}\Publish\${env:ProjectName}_win_x64_v${{ steps.tag.outputs.tag }}.exe" "${env:PublishFilePath}" Write-Output "exe_win_x64_SHA256=$(.\packaging\SHA256.ps1 ${env:PublishFilePath}\${env:ProjectName}_win_x64_v${{ steps.tag.outputs.tag }}.exe)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Package fd-win-x86 7z + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }} + shell: pwsh + run: | + New-Item -ItemType Directory -Path ${env:PublishFilePath} -Force > $null + Copy-Item ".\src\ST.Client.Desktop.Avalonia.App\bin\${env:Configuration}\Publish\${env:ProjectName}_win_x86_fde_v${{ steps.tag.outputs.tag }}.7z" "${env:PublishFilePath}" + Write-Output "fd_win_x86_SHA256=$(.\packaging\SHA256.ps1 ${env:PublishFilePath}\${env:ProjectName}_win_x86_fde_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + - name: Package fd-win-x86 exe + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }} + shell: pwsh + run: | + New-Item -ItemType Directory -Path ${env:PublishFilePath} -Force > $null + Copy-Item ".\src\ST.Client.Desktop.Avalonia.App\bin\${env:Configuration}\Publish\${env:ProjectName}_win_x86_fde_v${{ steps.tag.outputs.tag }}.exe" "${env:PublishFilePath}" + Write-Output "exe_fd_win_x86_SHA256=$(.\packaging\SHA256.ps1 ${env:PublishFilePath}\${env:ProjectName}_win_x86_fde_v${{ steps.tag.outputs.tag }}.exe)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + - name: Package win-x86 7z + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }} + shell: pwsh + run: | + New-Item -ItemType Directory -Path ${env:PublishFilePath} -Force > $null + Copy-Item ".\src\ST.Client.Desktop.Avalonia.App\bin\${env:Configuration}\Publish\${env:ProjectName}_win_x86_v${{ steps.tag.outputs.tag }}.7z" "${env:PublishFilePath}" + Write-Output "win_x86_SHA256=$(.\packaging\SHA256.ps1 ${env:PublishFilePath}\${env:ProjectName}_win_x86_v${{ steps.tag.outputs.tag }}.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + - name: Package win-x86 exe + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }} + shell: pwsh + run: | + New-Item -ItemType Directory -Path ${env:PublishFilePath} -Force > $null + Copy-Item ".\src\ST.Client.Desktop.Avalonia.App\bin\${env:Configuration}\Publish\${env:ProjectName}_win_x86_v${{ steps.tag.outputs.tag }}.exe" "${env:PublishFilePath}" + Write-Output "exe_win_x86_SHA256=$(.\packaging\SHA256.ps1 ${env:PublishFilePath}\${env:ProjectName}_win_x86_v${{ steps.tag.outputs.tag }}.exe)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Package osx-x64 7z if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }} shell: pwsh