From 23aa09fc07b4cadd8e086ab341e10460f21ad0a6 Mon Sep 17 00:00:00 2001 From: Naomi Carrigan Date: Tue, 10 Dec 2024 18:41:30 -0800 Subject: [PATCH 1/2] feat(tools): bump actions/artifact to v4 --- .github/workflows/CD-dev.yml | 11 +++++++---- .github/workflows/CD.yml | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index 0f9d7a2d..55f9c39c 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -38,16 +38,19 @@ jobs: - name: Archive build artifacts uses: actions/upload-artifact@v3 with: - name: dist - path: dist + name: dist-${{matrix.dotnet-version}} + path: "dist" + # Not sure if this is necessary, but this preserves existing behaviour. + include-hidden-files: true publish: runs-on: ubuntu-latest needs: [build] steps: - name: Download build artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: dist + pattern: dist-* + merge-multiple: true path: "dist" - name: Publish packages run: dotnet nuget push ./dist/**.nupkg --source nuget.org --api-key ${{secrets.NUGET_API_KEY}} diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 65ea37ac..be578a82 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -33,18 +33,21 @@ jobs: run: | dotnet pack Deepgram.sln --configuration Release --no-restore --output ./dist -p:Version=${{ steps.get_version.outputs.VERSION }} - name: Archive build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: dist + name: dist-${{matrix.dotnet-version}} path: dist + # Not sure if this is necessary, but this preserves existing behaviour. + include-hidden-files: true publish: runs-on: ubuntu-latest needs: [build] steps: - name: Download build artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: dist + pattern: dist-* + merge-multiple: true path: "dist" - name: Publish packages run: dotnet nuget push ./dist/**.nupkg --source nuget.org --api-key ${{secrets.NUGET_API_KEY}} From 4e7a08a8e9ad989d36a9826491b6904df9e6d630 Mon Sep 17 00:00:00 2001 From: Naomi Carrigan Date: Tue, 10 Dec 2024 18:46:22 -0800 Subject: [PATCH 2/2] fix: missed bumping this one --- .github/workflows/CD-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index 55f9c39c..80d64eb0 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -36,7 +36,7 @@ jobs: run: | dotnet pack Deepgram.DevBuild.sln --configuration Release --no-restore --output ./dist -p:Version=${{ steps.get_version.outputs.VERSION }} - name: Archive build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist-${{matrix.dotnet-version}} path: "dist"