SWI-3986 Fix Test Args in Deploy Workflow (#171)

* SWI-3986 Fix Workflows for Deployment * SWI-3986 Fix Test args in deploy workflow * add concurrency settings to the test workflow * Delete redundant workflow file
Bandwidth · Nov 21, 2023 · f659a2f · f659a2f
1 parent c81ab36
commit f659a2f
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 120 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -77,6 +77,27 @@ jobs:
     name: Deploy `main` to PYPI
     if: ${{ !github.event.release.prerelease && github.event.release.target_commitish == 'main' }}
     runs-on: ubuntu-latest
+    env:
+      BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
+      BW_USERNAME: ${{ secrets.BW_USERNAME }}
+      BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
+      BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
+      BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
+      BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
+      BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
+      BW_NUMBER: ${{ secrets.BW_NUMBER }}
+      USER_NUMBER: ${{ secrets.USER_NUMBER }}
+      VZW_NUMBER: ${{ secrets.VZW_NUMBER }}
+      ATT_NUMBER: ${{ secrets.ATT_NUMBER }}
+      T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }}
+      BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
+      PYTHON_VERSION: ${{ matrix.python-version }}
+      OPERATING_SYSTEM: ${{ matrix.os }}
+      MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
+      MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
+      MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
+      MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
+      BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }}
     steps:
       - name: Set Release Version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
@@ -99,16 +120,8 @@ jobs:
           pip install -r test-requirements.txt
 
       - name: Test
-        env:
-          BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
-          BW_USERNAME: ${{ secrets.BW_USERNAME }}
-          BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
-          BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
-          BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
-          BW_NUMBER: ${{ secrets.BW_NUMBER }}
-          USER_NUMBER: ${{ secrets.USER_NUMBER }}
-          BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
-        run: python -m pytest --pyargs bandwidth
+        run: |-
+          pytest -v
 
       - name: Deploy to PYPI
         run: |

diff --git a/.github/workflows/test-nightly.yml b/.github/workflows/test-nightly.yml
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -15,6 +15,32 @@ on:
         - WARNING
         - DEBUG
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+env:
+  BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
+  BW_USERNAME: ${{ secrets.BW_USERNAME }}
+  BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
+  BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
+  BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
+  BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
+  BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
+  BW_NUMBER: ${{ secrets.BW_NUMBER }}
+  USER_NUMBER: ${{ secrets.USER_NUMBER }}
+  VZW_NUMBER: ${{ secrets.VZW_NUMBER }}
+  ATT_NUMBER: ${{ secrets.ATT_NUMBER }}
+  T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }}
+  BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
+  PYTHON_VERSION: ${{ matrix.python-version }}
+  OPERATING_SYSTEM: ${{ matrix.os }}
+  MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
+  MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
+  MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
+  MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
+  BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }}
+
 jobs:
   deploy:
     name: Test
@@ -23,27 +49,6 @@ jobs:
       matrix:
         os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-latest]
         python-version: [3.8, 3.9, "3.10", "3.11"]
-    env:
-      BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
-      BW_USERNAME: ${{ secrets.BW_USERNAME }}
-      BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
-      BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
-      BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
-      BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
-      BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
-      BW_NUMBER: ${{ secrets.BW_NUMBER }}
-      USER_NUMBER: ${{ secrets.USER_NUMBER }}
-      VZW_NUMBER: ${{ secrets.VZW_NUMBER }}
-      ATT_NUMBER: ${{ secrets.ATT_NUMBER }}
-      T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }}
-      BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
-      PYTHON_VERSION: ${{ matrix.python-version }}
-      OPERATING_SYSTEM: ${{ matrix.os }}
-      MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
-      MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
-      MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
-      MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
-      BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }}
 
     steps:
       - name: Checkout