Skip to content

Commit f659a2f

Browse files
authored
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
1 parent c81ab36 commit f659a2f

File tree

3 files changed

+49
-120
lines changed

3 files changed

+49
-120
lines changed

.github/workflows/deploy.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,27 @@ jobs:
7777
name: Deploy `main` to PYPI
7878
if: ${{ !github.event.release.prerelease && github.event.release.target_commitish == 'main' }}
7979
runs-on: ubuntu-latest
80+
env:
81+
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
82+
BW_USERNAME: ${{ secrets.BW_USERNAME }}
83+
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
84+
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
85+
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
86+
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
87+
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
88+
BW_NUMBER: ${{ secrets.BW_NUMBER }}
89+
USER_NUMBER: ${{ secrets.USER_NUMBER }}
90+
VZW_NUMBER: ${{ secrets.VZW_NUMBER }}
91+
ATT_NUMBER: ${{ secrets.ATT_NUMBER }}
92+
T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }}
93+
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
94+
PYTHON_VERSION: ${{ matrix.python-version }}
95+
OPERATING_SYSTEM: ${{ matrix.os }}
96+
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
97+
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
98+
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
99+
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
100+
BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }}
80101
steps:
81102
- name: Set Release Version
82103
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
@@ -99,16 +120,8 @@ jobs:
99120
pip install -r test-requirements.txt
100121
101122
- name: Test
102-
env:
103-
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
104-
BW_USERNAME: ${{ secrets.BW_USERNAME }}
105-
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
106-
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
107-
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
108-
BW_NUMBER: ${{ secrets.BW_NUMBER }}
109-
USER_NUMBER: ${{ secrets.USER_NUMBER }}
110-
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
111-
run: python -m pytest --pyargs bandwidth
123+
run: |-
124+
pytest -v
112125
113126
- name: Deploy to PYPI
114127
run: |

.github/workflows/test-nightly.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.

.github/workflows/test.yaml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,32 @@ on:
1515
- WARNING
1616
- DEBUG
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.head_ref }}
20+
cancel-in-progress: true
21+
22+
env:
23+
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
24+
BW_USERNAME: ${{ secrets.BW_USERNAME }}
25+
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
26+
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
27+
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
28+
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
29+
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
30+
BW_NUMBER: ${{ secrets.BW_NUMBER }}
31+
USER_NUMBER: ${{ secrets.USER_NUMBER }}
32+
VZW_NUMBER: ${{ secrets.VZW_NUMBER }}
33+
ATT_NUMBER: ${{ secrets.ATT_NUMBER }}
34+
T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }}
35+
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
36+
PYTHON_VERSION: ${{ matrix.python-version }}
37+
OPERATING_SYSTEM: ${{ matrix.os }}
38+
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
39+
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
40+
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
41+
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
42+
BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }}
43+
1844
jobs:
1945
deploy:
2046
name: Test
@@ -23,27 +49,6 @@ jobs:
2349
matrix:
2450
os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-latest]
2551
python-version: [3.8, 3.9, "3.10", "3.11"]
26-
env:
27-
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
28-
BW_USERNAME: ${{ secrets.BW_USERNAME }}
29-
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
30-
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
31-
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
32-
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
33-
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
34-
BW_NUMBER: ${{ secrets.BW_NUMBER }}
35-
USER_NUMBER: ${{ secrets.USER_NUMBER }}
36-
VZW_NUMBER: ${{ secrets.VZW_NUMBER }}
37-
ATT_NUMBER: ${{ secrets.ATT_NUMBER }}
38-
T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }}
39-
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
40-
PYTHON_VERSION: ${{ matrix.python-version }}
41-
OPERATING_SYSTEM: ${{ matrix.os }}
42-
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
43-
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
44-
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
45-
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
46-
BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }}
4752

4853
steps:
4954
- name: Checkout

0 commit comments

Comments
 (0)