diff --git a/.github/workflows/publish-nuget-beta.yml b/.github/workflows/publish-nuget-beta.yml deleted file mode 100644 index 8ad9e81f2..000000000 --- a/.github/workflows/publish-nuget-beta.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Vonage.Video.Beta NuGet Release -on: workflow_dispatch -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.event.release.target_commitish }} - - name: Release Nuget - uses: nexmo/github-actions/nuget-release@main - env: - PROJECT_FILE: Vonage.Server/Vonage.Server.csproj - BRANCH: main - ORGANIZATION: Vonage - REPO: vonage-dotnet-sdk - TAG: ${{ github.event.release.tag_name }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} - GITHUB_USER_NAME: NexmoDev - GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com - OUTPUT_PATH: Vonage.Video.Beta/bin/Release - - name: Release Nuget - uses: nexmo/github-actions/nuget-release@main - env: - PROJECT_FILE: Vonage.Server/Vonage.Server.csproj - BRANCH: main - ORGANIZATION: Vonage - REPO: vonage-dotnet-sdk - TAG: ${{ github.event.release.tag_name }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} - GITHUB_USER_NAME: NexmoDev - GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com - OUTPUT_PATH: Vonage.Video.Beta/bin/ReleaseSigned - CONFIGURATION: ReleaseSigned diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index cf210f776..a2e6693ba 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -1,17 +1,20 @@ name: Nuget Release -on: workflow_dispatch +on: + release: + types: [ published ] jobs: - build: + coreSDK: runs-on: ubuntu-latest + if: contains(github.event.release.target_commitish, 'release/core/') steps: - uses: actions/checkout@v2 with: - ref: ${{ github.event.release.target_commitish }} + ref: ${{ github.event.release.target_commitish }} - name: Release Nuget uses: nexmo/github-actions/nuget-release@main env: PROJECT_FILE: Vonage/Vonage.csproj - BRANCH: main + BRANCH: ${{ github.event.release.target_commitish }} ORGANIZATION: Vonage REPO: vonage-dotnet-sdk TAG: ${{ github.event.release.tag_name }} @@ -20,11 +23,11 @@ jobs: GITHUB_USER_NAME: NexmoDev GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com OUTPUT_PATH: Vonage/bin/Release - - name: Release Nuget + - name: Release Nuget Signed uses: nexmo/github-actions/nuget-release@main env: PROJECT_FILE: Vonage/Vonage.csproj - BRANCH: main + BRANCH: ${{ github.event.release.target_commitish }} ORGANIZATION: Vonage REPO: vonage-dotnet-sdk TAG: ${{ github.event.release.tag_name }} @@ -34,3 +37,37 @@ jobs: GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com OUTPUT_PATH: Vonage/bin/ReleaseSigned CONFIGURATION: ReleaseSigned + videoSDK: + runs-on: ubuntu-latest + if: contains(github.event.release.target_commitish, 'release/video/') + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.release.target_commitish }} + - name: Release Nuget + uses: nexmo/github-actions/nuget-release@main + env: + PROJECT_FILE: Vonage.Server/Vonage.Server.csproj + BRANCH: ${{ github.event.release.target_commitish }} + ORGANIZATION: Vonage + REPO: vonage-dotnet-sdk + TAG: ${{ github.event.release.tag_name }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} + GITHUB_USER_NAME: NexmoDev + GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com + OUTPUT_PATH: Vonage.Server/bin/ReleaseSigned + - name: Release Nuget Signed + uses: nexmo/github-actions/nuget-release@main + env: + PROJECT_FILE: Vonage.Server/Vonage.Server.csproj + BRANCH: ${{ github.event.release.target_commitish }} + ORGANIZATION: Vonage + REPO: vonage-dotnet-sdk + TAG: ${{ github.event.release.tag_name }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} + GITHUB_USER_NAME: NexmoDev + GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com + OUTPUT_PATH: Vonage.Server/bin/ReleaseSigned + CONFIGURATION: ReleaseSigned \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index da6ac09db..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Release published -on: - release: - types: [published, edited, prereleased] -jobs: - add-changelog: - name: Add Changelog - runs-on: ubuntu-latest - steps: - - name: Add Changelog - uses: nexmo/github-actions/nexmo-changelog@main - env: - CHANGELOG_AUTH_TOKEN: ${{ secrets.CHANGELOG_AUTH_TOKEN }} - CHANGELOG_CATEGORY: Server SDK - CHANGELOG_RELEASE_TITLE: nexmo-dotnet - CHANGELOG_SUBCATEGORY: dotnet diff --git a/Vonage.Server/Vonage.Server.csproj b/Vonage.Server/Vonage.Server.csproj index bcef8de3d..211e0dd05 100644 --- a/Vonage.Server/Vonage.Server.csproj +++ b/Vonage.Server/Vonage.Server.csproj @@ -28,13 +28,12 @@ Official C#/.NET wrapper for the Vonage API. To use it you will need a Vonage account. Sign up for free at vonage.com. For full API documentation refer to developer.vonage.com. - 8.0.0-beta + 7.0.0-beta Vonage Video Vonage Vonage.Server Vonage.Server Vonage.Server - 8.0.0 diff --git a/Vonage.sln b/Vonage.sln index 4656ce4a9..d89301374 100644 --- a/Vonage.sln +++ b/Vonage.sln @@ -18,9 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{ ProjectSection(SolutionItems) = preProject .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml .github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml - .github\workflows\release.yml = .github\workflows\release.yml .github\workflows\mutation-testing.yml = .github\workflows\mutation-testing.yml - .github\workflows\publish-nuget-beta.yml = .github\workflows\publish-nuget-beta.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vonage.Server", "Vonage.Server\Vonage.Server.csproj", "{AC22C44D-AE7A-4FA1-8EA3-479578D6E3C6}"