From 38baa65a3725aa0634649751efa4da57873767f8 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 7 Feb 2025 14:48:34 -0500 Subject: [PATCH 1/6] SWI-6937 Add Smoke Tests for UP Account --- .github/workflows/test-smoke.yml | 53 ++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index 24ccaff0..20efeedc 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -14,19 +14,12 @@ concurrency: cancel-in-progress: true env: - BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} - BW_PASSWORD: ${{ secrets.BW_PASSWORD }} BW_USERNAME: ${{ secrets.BW_USERNAME }} - 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 }} + BW_PASSWORD: ${{ secrets.BW_PASSWORD }} BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }} BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }} - MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} - MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }} - MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} + USER_NUMBER: ${{ secrets.USER_NUMBER }} + BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }} MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} ATT_NUMBER: ${{ secrets.ATT_NUMBER }} T_MOBILE_NUMBER: ${{ secrets.T_MOBILE_NUMBER }} @@ -36,6 +29,46 @@ jobs: test: name: Test runs-on: ubuntu-latest + env: + BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} + BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }} + BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }} + BW_NUMBER: ${{ secrets.BW_NUMBER }} + MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }} + MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }} + MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: 21 + + - name: Build Package and Test + env: + JAVA_VERSION: 21 + RUNNER_OS: ubuntu-latest + OPERATING_SYSTEM: ubuntu-latest + DISTRIBUTION: zulu + run: | + mvn -B package --file pom.xml -DskipTests + mvn test -Psmoke-tests + shell: bash + + test_up: + name: Test + runs-on: ubuntu-latest + env: + BW_ACCOUNT_ID: ${{ secrets.BW_UP_ACCOUNT_ID }} + BW_VOICE_APPLICATION_ID: ${{ secrets.BW_UP_VOICE_APPLICATION_ID }} + BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_UP_MESSAGING_APPLICATION_ID }} + BW_NUMBER: ${{ secrets.BW_UP_NUMBER }} + MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_UP_ACTIVE_NUMBER }} + MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_UP_IDLE_NUMBER }} + MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_UP_APPLICATION_ID }} steps: - name: Checkout uses: actions/checkout@v4 From 89602719a2355851c49516da120ba0988a8ba6df Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 7 Feb 2025 14:50:34 -0500 Subject: [PATCH 2/6] add path --- .github/workflows/test-smoke.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index 20efeedc..1eb7fb46 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -8,6 +8,7 @@ on: - main paths: - "src/test/java/com/bandwidth/sdk/smoke/*" + - ".github/workflows/test-smoke.yml" concurrency: group: ${{ github.workflow }}-${{ github.head_ref }} From 19a9b34454200ef0228363f83e02dbe21515d463 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 7 Feb 2025 14:54:36 -0500 Subject: [PATCH 3/6] job names --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/test-smoke.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c6678913..0f723066 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,11 +1,11 @@ -name: Deploy +name: Deploy SDK on: release: types: - published jobs: - publish: + deploy: env: BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} BW_USERNAME: ${{ secrets.BW_USERNAME }} diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index 1eb7fb46..16144b99 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -1,4 +1,4 @@ -name: Smoke Test +name: Smoke Tests on: schedule: From 5b1185e01cd4b27205b8a39f3bcda4dab3bb4c09 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 7 Feb 2025 14:55:47 -0500 Subject: [PATCH 4/6] smoke tests --- .github/workflows/test-smoke.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index 16144b99..84663ee1 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -4,8 +4,6 @@ on: schedule: - cron: "0 4 * * *" pull_request: - branches: - - main paths: - "src/test/java/com/bandwidth/sdk/smoke/*" - ".github/workflows/test-smoke.yml" From 804c671e86c88149f1448faa0bb6c591ef03fa59 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 7 Feb 2025 14:58:58 -0500 Subject: [PATCH 5/6] remove wf dispatch --- .github/workflows/test-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index eb6ed170..8f2064b7 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -4,7 +4,6 @@ on: pull_request: branches: - main - workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.head_ref }} From 64e2e7fb9fb2d7d4df3145b0f5a4c7e61001b8f8 Mon Sep 17 00:00:00 2001 From: ckoegel Date: Fri, 7 Feb 2025 15:06:03 -0500 Subject: [PATCH 6/6] sync workflow files --- .github/workflows/deploy.yml | 111 ++++++++++++++++--------------- .github/workflows/test-pr.yml | 46 ++++++------- .github/workflows/test-smoke.yml | 6 +- 3 files changed, 83 insertions(+), 80 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0f723066..c41efe70 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,6 +6,8 @@ on: jobs: deploy: + name: Deploy SDK to Maven Central + runs-on: ubuntu-latest env: BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} BW_USERNAME: ${{ secrets.BW_USERNAME }} @@ -27,66 +29,67 @@ jobs: MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }} MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }} BW_NUMBER_PROVIDER: ${{ secrets.BW_NUMBER_PROVIDER }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Apache Maven Central - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: 21 - server-id: 'ossrh' - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD - gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE + steps: + - name: Set Release Version + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV + + - name: Checkout + uses: actions/checkout@v4 - - name: Get Maven Project Version - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV + - name: Set up Apache Maven Central + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: 21 + server-id: 'ossrh' + server-username: OSSRH_USERNAME + server-password: OSSRH_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - - name: Set OpenAPI Generator Version - run: | - OPENAPI_VERSION=$(jq .["generator-cli"].version openapitools.json) - echo "OPENAPI_GENERATOR_VERSION=$OPENAPI_VERSION" >> $GITHUB_ENV - shell: bash + - name: Set OpenAPI Generator Version + run: | + OPENAPI_VERSION=$(jq .["generator-cli"].version openapitools.json) + echo "OPENAPI_GENERATOR_VERSION=$OPENAPI_VERSION" >> $GITHUB_ENV + shell: bash - - name: Build SDK - uses: Bandwidth/generate-sdk-action@v4.0.0 - with: - openapi-generator-version: ${{ env.OPENAPI_GENERATOR_VERSION }} - language: java - additional-properties: --additional-properties=artifactVersion=$RELEASE_VERSION + - name: Generate SDK with Updated Version + uses: Bandwidth/generate-sdk-action@v4.0.0 + with: + openapi-generator-version: ${{ env.OPENAPI_GENERATOR_VERSION }} + language: java + additional-properties: --additional-properties=artifactVersion=$RELEASE_VERSION - - name: Clean SDK - run: mvn clean + - name: Clean SDK + run: mvn clean - - name: Set Maven Project Version - run: mvn versions:set -DnewVersion=$RELEASE_VERSION + - name: Set Maven Project Version + run: mvn versions:set -DnewVersion=$RELEASE_VERSION - - name: Build Package and Test - env: - JAVA_VERSION: 21 - RUNNER_OS: ubuntu-latest - OPERATING_SYSTEM: ubuntu -latest - DISTRIBUTION: adopt - run: | - mvn -B package --file pom.xml -DskipTests - npm install -g @stoplight/prism-cli - prism mock ./bandwidth.yml & (sleep 3; mvn test -Punit-tests) - shell: bash + - name: Build Package and Test + env: + JAVA_VERSION: 21 + RUNNER_OS: ubuntu-latest + OPERATING_SYSTEM: ubuntu -latest + DISTRIBUTION: adopt + run: | + mvn -B package --file pom.xml -DskipTests + npm install -g @stoplight/prism-cli + prism mock ./bandwidth.yml & (sleep 3; mvn test -Punit-tests) + shell: bash - - name: Publish to Apache Maven Central - run: mvn deploy -DskipTests - env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + - name: Publish to Apache Maven Central + run: mvn deploy -DskipTests + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - - name: Notify Slack - uses: Bandwidth/build-notify-slack-action@v2.0.0 - if: always() - with: - job-status: ${{ job.status }} - slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }} - slack-channel: ${{ secrets.SLACK_CHANNEL }} + - name: Notify Slack + uses: Bandwidth/build-notify-slack-action@v2.0.0 + if: always() + with: + job-status: ${{ job.status }} + slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }} + slack-channel: ${{ secrets.SLACK_CHANNEL }} diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 8f2064b7..36a8266f 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -34,29 +34,29 @@ jobs: name: Test PR runs-on: ${{ matrix.os }} strategy: - matrix: - os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04] - java-version: ["11", "17", "21"] - distribution: ["zulu", "temurin"] - fail-fast: false + matrix: + os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04] + java-version: ["11", "17", "21"] + distribution: ["zulu", "temurin"] + fail-fast: false steps: - - name: Checkout - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: ${{ matrix.distribution }} - java-version: ${{ matrix.java-version }} + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java-version }} - - name: Build Package and Test - env: - JAVA_VERSION: ${{ matrix.java-version }} - RUNNER_OS: ${{ matrix.os }} - OPERATING_SYSTEM: ${{ matrix.os }} - DISTRIBUTION: ${{ matrix.distribution }} - run: | - mvn -B package --file pom.xml -DskipTests - npm install -g @stoplight/prism-cli - prism mock ./bandwidth.yml & (sleep 3; mvn test -Punit-tests) - shell: bash + - name: Build Package and Test + env: + JAVA_VERSION: ${{ matrix.java-version }} + RUNNER_OS: ${{ matrix.os }} + OPERATING_SYSTEM: ${{ matrix.os }} + DISTRIBUTION: ${{ matrix.distribution }} + run: | + mvn -B package --file pom.xml -DskipTests + npm install -g @stoplight/prism-cli + prism mock ./bandwidth.yml & (sleep 3; mvn test -Punit-tests) + shell: bash diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml index 84663ee1..8d2ab049 100644 --- a/.github/workflows/test-smoke.yml +++ b/.github/workflows/test-smoke.yml @@ -26,7 +26,7 @@ env: jobs: test: - name: Test + name: Smoke Test runs-on: ubuntu-latest env: BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }} @@ -58,7 +58,7 @@ jobs: shell: bash test_up: - name: Test + name: Smoke Test UP Account runs-on: ubuntu-latest env: BW_ACCOUNT_ID: ${{ secrets.BW_UP_ACCOUNT_ID }} @@ -91,7 +91,7 @@ jobs: notify_for_failures: name: Notify for Failures - needs: [test] + needs: [test, test_up] if: failure() runs-on: ubuntu-latest steps: