Skip to content

Commit

Permalink
Merge branch 'mar2024-webinar-prep' of https://github.com/SmartBear-D…
Browse files Browse the repository at this point in the history
  • Loading branch information
frankkilcommins committed Mar 20, 2024
2 parents 24e656b + c835ad0 commit ef1ac6e
Show file tree
Hide file tree
Showing 6 changed files with 4,702 additions and 1,179 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ConsumerCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- '.github/workflows/ConsumerCI.yml'
- 'oas/**'
pull_request:
branches: ['main']
branches: ['main', 'mar2024-webinar-prep']
paths:
- 'smartbearcoin-payments-ui/**'
- '.github/workflows/ConsumerCI.yml'
Expand Down Expand Up @@ -88,12 +88,12 @@ jobs:
application_name: ${{ needs.setup.outputs.PACT_CONSUMER }}

deploy-to-acc:
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/mar2024-webinar-prep'
needs: [setup, can-i-deploy-to-acc]
runs-on: ubuntu-latest
env:
deploy_target: acceptance
REACT_APP_API_BASE_URL: https://sbdevrel-fua-smartbearcoin-acc.azurewebsites.net/api
REACT_APP_API_BASE_URL: https://sbdevrel-fua-smartbearcoin-acc1.azurewebsites.net/api
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -123,12 +123,12 @@ jobs:
application_name: ${{ needs.setup.outputs.PACT_CONSUMER }}

deploy-to-production:
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/mar2024-webinar-prep'
needs: [setup, can-i-deploy-to-production, deploy-to-acc]
runs-on: ubuntu-latest
env:
deploy_target: production
REACT_APP_API_BASE_URL: https://sbdevrel-fua-smartbearcoin-prd.azurewebsites.net/api
REACT_APP_API_BASE_URL: https://sbdevrel-fua-smartbearcoin-prd1.azurewebsites.net/api
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ProviderCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ jobs:
PROJECT_FOLDER: ReadyAPI_Tests
PROJECT_FILE: 'SmartBearCoin-Payee-Provider-readyapi-project.xml'
SLM_API_KEY: ${{ secrets.SLM_API_KEY }}
ENDPOINT: https://sbdevrel-fua-smartbearcoin-acc.azurewebsites.net/api
ENDPOINT: https://sbdevrel-fua-smartbearcoin-acc1.azurewebsites.net/api

record-deploy-acc:
needs:
Expand Down Expand Up @@ -377,4 +377,4 @@ jobs:
PROJECT_FOLDER: ReadyAPI_Tests
PROJECT_FILE: 'SmartBearCoin-Payee-Provider-readyapi-project.xml'
SLM_API_KEY: ${{ secrets.SLM_API_KEY }}
ENDPOINT: https://sbdevrel-fua-smartbearcoin-prd.azurewebsites.net/api
ENDPOINT: https://sbdevrel-fua-smartbearcoin-prd1.azurewebsites.net/api
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ describe('CustomerManagementPayeesApi', () => {
3. `npm run test` - Run the Pact tests locally
4. `npm run start` - Run the website locally
1. You can update the endpoint used for the provider, by setting the environment variable `REACT_APP_API_BASE_URL`
1. <https://sbdevrel-fua-smartbearcoin-prd.azurewebsites.net/api> - Production
2. <https://sbdevrel-fua-smartbearcoin-acc.azurewebsites.net/api> - Acceptance
1. <https://sbdevrel-fua-smartbearcoin-prd1.azurewebsites.net/api> - Production
2. <https://sbdevrel-fua-smartbearcoin-acc1.azurewebsites.net/api> - Acceptance
3. <https://virtserver.swaggerhub.com/mhiggins-sa/payee-api/1.0.0> - Mock
4. <http://localhost:7071/api/> - Locally running provider (see provider section for details on how to run locally)

Expand All @@ -405,7 +405,7 @@ You can utilise [SwaggerHub Explore](https://swagger.io/tools/swaggerhub-explore

1. Visit https://explore.swaggerhub.com/
2. Copy the following URL and paste it into the address bar
1. `https://sbdevrel-fua-smartbearcoin-prd.azurewebsites.net/api/payees?country_of_registration=IE&jurisdiction_identifier=06488522&jurisdiction_identifier_type=chamber-of-commerce-number`
1. `https://sbdevrel-fua-smartbearcoin-prd1.azurewebsites.net/api/payees?country_of_registration=IE&jurisdiction_identifier=06488522&jurisdiction_identifier_type=chamber-of-commerce-number`
3. Press `Send`
4. Congrats 🎉 you just send your first request in Explore.

Expand Down
Loading

0 comments on commit ef1ac6e

Please sign in to comment.