From ce128e27fe40ae19765d2fffd7915222bf7baad5 Mon Sep 17 00:00:00 2001 From: Julia Januchowski Date: Mon, 23 Oct 2023 11:06:50 -0400 Subject: [PATCH 1/7] SWI-1695: updating the regex again --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e5c561c..fe2b695 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,7 @@ jobs: - name: Check Release Tag Format run: | - re=^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(beta|alpha|rc))(\.[0-9]+)?$ + re='^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(beta|alpha|rc))(\.[0-9]+)?$' if ! [[ $RELEASE_VERSION =~ $re ]]; then echo "Tag does not match expected regex pattern for beta releases ($re)" echo $RELEASE_VERSION @@ -88,7 +88,7 @@ jobs: - name: Check Release Tag Format run: | - re=^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$ + re='^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$' if ! [[ $RELEASE_VERSION =~ $re ]]; then echo "Tag does not match expected regex pattern for releases ($re)" echo $RELEASE_VERSION From 832ea9317338a9cc759f42045d401d2d5a9d4029 Mon Sep 17 00:00:00 2001 From: Julia Januchowski Date: Mon, 23 Oct 2023 12:54:39 -0400 Subject: [PATCH 2/7] SWI-1695: updating the regex again pt.2 --- .github/workflows/deploy.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fe2b695..ea0ba01 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,12 +37,11 @@ jobs: - name: Check Release Tag Format run: | - re='^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(beta|alpha|rc))(\.[0-9]+)?$' - if ! [[ $RELEASE_VERSION =~ $re ]]; then - echo "Tag does not match expected regex pattern for beta releases ($re)" + if ! [[ $RELEASE_VERSION =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-(beta|alpha|rc))(\.[0-9][0-9]*)?$ ]]; then + echo "Tag does not match expected regex pattern for beta releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-(beta|alpha|rc))(\.[0-9][0-9]*)?$)" echo $RELEASE_VERSION echo 'Please update your tag to match the expected regex pattern' - exit 1 + # exit 1 fi - name: Checkout @@ -88,9 +87,8 @@ jobs: - name: Check Release Tag Format run: | - re='^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$' - if ! [[ $RELEASE_VERSION =~ $re ]]; then - echo "Tag does not match expected regex pattern for releases ($re)" + if ! [[ $RELEASE_VERSION =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then + echo "Tag does not match expected regex pattern for releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$)" echo $RELEASE_VERSION echo 'Please update your tag to match the expected regex pattern' exit 1 From 8edaad9d03899d49aea6a9ede40623ac354d12a3 Mon Sep 17 00:00:00 2001 From: Julia Januchowski Date: Mon, 23 Oct 2023 12:56:41 -0400 Subject: [PATCH 3/7] SWI-1695: removed comment --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ea0ba01..dc77006 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,7 +41,7 @@ jobs: echo "Tag does not match expected regex pattern for beta releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-(beta|alpha|rc))(\.[0-9][0-9]*)?$)" echo $RELEASE_VERSION echo 'Please update your tag to match the expected regex pattern' - # exit 1 + exit 1 fi - name: Checkout From 32bd9aba78bb5c7847a29f32939e47f58be4ed58 Mon Sep 17 00:00:00 2001 From: Julia Januchowski Date: Mon, 23 Oct 2023 13:02:22 -0400 Subject: [PATCH 4/7] SWI-1695: Update quotes --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dc77006..4ce0c2a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,7 +38,7 @@ jobs: - name: Check Release Tag Format run: | if ! [[ $RELEASE_VERSION =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-(beta|alpha|rc))(\.[0-9][0-9]*)?$ ]]; then - echo "Tag does not match expected regex pattern for beta releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-(beta|alpha|rc))(\.[0-9][0-9]*)?$)" + echo 'Tag does not match expected regex pattern for beta releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-(beta|alpha|rc))(\.[0-9][0-9]*)?$)' echo $RELEASE_VERSION echo 'Please update your tag to match the expected regex pattern' exit 1 @@ -88,7 +88,7 @@ jobs: - name: Check Release Tag Format run: | if ! [[ $RELEASE_VERSION =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then - echo "Tag does not match expected regex pattern for releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$)" + echo 'Tag does not match expected regex pattern for releases (^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$)' echo $RELEASE_VERSION echo 'Please update your tag to match the expected regex pattern' exit 1 From 352c9bf97ee3b6b7a1e10624a948d8a7bbb505ae Mon Sep 17 00:00:00 2001 From: Julia Januchowski Date: Mon, 23 Oct 2023 15:25:35 -0400 Subject: [PATCH 5/7] SWI-1695: Add missing environment variable --- .github/workflows/deploy.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4ce0c2a..ab685b6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,9 +19,10 @@ env: MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }} MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} - MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} + MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} OPERATING_SYSTEM: ubuntu-latest CSHARP_VERSION: 7.0.x + DOTNET: 7.0.x jobs: deploy_pre_release: @@ -54,7 +55,7 @@ jobs: with: dotnet-version: '7.0.x' - - name: Run integration tests + - name: Run functional tests run: dotnet test $BW_PROJECT_TEST_NAME - name: Pack NuGet package @@ -102,7 +103,7 @@ jobs: with: dotnet-version: '7.0.x' - - name: Run integration tests + - name: Run functional tests run: dotnet test $BW_PROJECT_TEST_NAME - name: Pack NuGet package From 25e8c9ce5d9a6c6f90d09bbf17f40c3d0dc079cd Mon Sep 17 00:00:00 2001 From: Julia Januchowski <55033207+juliajanu@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:42:04 -0400 Subject: [PATCH 6/7] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ab685b6..aac4cc1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ env: MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }} MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} - MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} + MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} OPERATING_SYSTEM: ubuntu-latest CSHARP_VERSION: 7.0.x DOTNET: 7.0.x From 06e4d85b8e1963ee36d3667cf76ead0506977569 Mon Sep 17 00:00:00 2001 From: Julia Januchowski Date: Mon, 23 Oct 2023 15:55:15 -0400 Subject: [PATCH 7/7] SWI-1695: Updated env vars --- .github/workflows/deploy.yml | 3 +-- .github/workflows/test-nightly.yml | 8 ++------ .github/workflows/test-pr.yml | 4 +--- .../Bandwidth.Standard.Test.csproj | 4 ++-- .../Integration/ConferencesIntegrationTests.cs | 2 +- .../Integration/RecordingsIntegrationTests.cs | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ab685b6..e224f23 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,8 +21,7 @@ env: MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} OPERATING_SYSTEM: ubuntu-latest - CSHARP_VERSION: 7.0.x - DOTNET: 7.0.x + DOTNET_VERSION: 7.0.x jobs: deploy_pre_release: diff --git a/.github/workflows/test-nightly.yml b/.github/workflows/test-nightly.yml index 6d5260c..34e625e 100644 --- a/.github/workflows/test-nightly.yml +++ b/.github/workflows/test-nightly.yml @@ -41,9 +41,7 @@ jobs: - name: Run functional tests env: OPERATING_SYSTEM: ${{ matrix.os }} - CSHARP_VERSION: ${{ matrix.dotnet }} - # Required for multiple target frameworks in the StandardTests project. - DOTNET: ${{ matrix.dotnet }} + DOTNET_VERSION: ${{ matrix.dotnet }} run: dotnet test src/Bandwidth.Standard.Test test_feature: @@ -67,9 +65,7 @@ jobs: - name: Run functional tests env: OPERATING_SYSTEM: ${{ matrix.os }} - CSHARP_VERSION: ${{ matrix.dotnet }} - # Required for multiple target frameworks in the StandardTests project. - DOTNET: ${{ matrix.dotnet }} + DOTNET_VERSION: ${{ matrix.dotnet }} run: dotnet test src/Bandwidth.Standard.Test notify_for_failures: diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 764c1df..c14691e 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -39,7 +39,5 @@ jobs: - name: Run functional tests env: OPERATING_SYSTEM: ${{ matrix.os }} - CSHARP_VERSION: ${{ matrix.dotnet }} - # Required for multiple target frameworks in the StandardTests project. - DOTNET: ${{ matrix.dotnet }} + DOTNET_VERSION: ${{ matrix.dotnet }} run: dotnet test src/Bandwidth.Standard.Test diff --git a/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj b/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj index a4af930..78023e6 100644 --- a/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj +++ b/src/Bandwidth.Standard.Test/Bandwidth.Standard.Test.csproj @@ -3,8 +3,8 @@ Bandwidth.Standard.Test Bandwidth.Standard.Test - net6.0 - net7.0 + net6.0 + net7.0 false diff --git a/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs b/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs index 88e08b4..931c823 100644 --- a/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs +++ b/src/Bandwidth.Standard.Test/Integration/ConferencesIntegrationTests.cs @@ -99,7 +99,7 @@ public Tuple CreateConferenceTest() var jsonBody = JsonSerializer.Serialize(new { os = Environment.GetEnvironmentVariable("OPERATING_SYSTEM"), - language = "csharp" + Environment.GetEnvironmentVariable("CSHARP_VERSION"), + language = "csharp" + Environment.GetEnvironmentVariable("DOTNET_VERSION"), type = "CONFERENCE" }); var options = new RequestOptions diff --git a/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs b/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs index c3bde7f..2dc89e4 100644 --- a/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs +++ b/src/Bandwidth.Standard.Test/Integration/RecordingsIntegrationTests.cs @@ -109,7 +109,7 @@ public Tuple CreateAndValidateCall() var jsonBody = JsonSerializer.Serialize(new { os = Environment.GetEnvironmentVariable("OPERATING_SYSTEM"), - language = "csharp" + Environment.GetEnvironmentVariable("CSHARP_VERSION"), + language = "csharp" + Environment.GetEnvironmentVariable("DOTNET_VERSION"), type = "CALL" }); var options = new RequestOptions