From 968a34688012284bb3d4c49e73bd14f3a949df5b Mon Sep 17 00:00:00 2001 From: Danilo Del Busso Date: Wed, 14 Feb 2024 10:32:22 -0500 Subject: [PATCH] Misc changes to SDK actions - Upload PS DLLs as part of SDK artefacts - Use one call to upload all artefacts in release.yml Signed-off-by: Danilo Del Busso --- .github/workflows/generate-and-build-sdks.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-and-build-sdks.yml b/.github/workflows/generate-and-build-sdks.yml index 6a58aa6ce83..a0bee3a7fd0 100644 --- a/.github/workflows/generate-and-build-sdks.yml +++ b/.github/workflows/generate-and-build-sdks.yml @@ -129,7 +129,7 @@ jobs: New-Item -Path "." -Name "output" -ItemType "directory" Copy-Item -Verbose "source\README_51.md" -Destination "output" -Force Copy-Item -Verbose "source\LICENSE" -Destination "output" -Force - Copy-Item -Path "source\src\bin\Release\net45\*" -Include ".dll" "output\" + Copy-Item -Path "source\src\bin\Release\net45\*" -Include "*.dll" "output\" Get-ChildItem -Path "source" |` Where-Object { $_.Extension -eq ".ps1" -or $_.Extension -eq ".ps1xml" -or $_.Extension -eq ".psd1" -or $_.Extension -eq ".txt" } |` ForEach-Object -Process { Copy-Item -Verbose $_.FullName -Destination "output" } @@ -199,7 +199,7 @@ jobs: New-Item -Path "." -Name "output" -ItemType "directory" Copy-Item -Verbose "source\README.md" -Destination "output" -Force Copy-Item -Verbose "source\LICENSE" -Destination "output" -Force - Copy-Item -Path "source\src\bin\Release\net${{ matrix.dotnet }}.0\*" -Include ".dll" "output\" + Copy-Item -Path "source\src\bin\Release\net${{ matrix.dotnet }}.0\*" -Include "*.dll" "output\" Get-ChildItem -Path "source" |` Where-Object { $_.Extension -eq ".ps1" -or $_.Extension -eq ".ps1xml" -or $_.Extension -eq ".psd1" -or $_.Extension -eq ".txt" } |` ForEach-Object -Process { Copy-Item -Verbose $_.FullName -Destination "output" } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48e7f81a839..cf7ebebd2a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,9 +81,9 @@ jobs: - name: Create release ${{ github.ref_name }} shell: bash run: | - gh release create ${{ github.ref_name }} --repo ${{ github.repository }} --generate-notes dist/* - gh release upload ${{ github.ref_name }} --repo ${{ github.repository }} PowerShell-SDK-5.x-prerelease-unsigned.zip - gh release upload ${{ github.ref_name }} --repo ${{ github.repository }} PowerShell-SDK-7.x-prerelease-unsigned.zip + gh release create ${{ github.ref_name }} --repo ${{ github.repository }} --generate-notes dist/* \ + PowerShell-SDK-5.x-prerelease-unsigned.zip \ + PowerShell-SDK-7.x-prerelease-unsigned.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}