Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions .github/workflows/dispatch-web-update.yml

This file was deleted.

36 changes: 24 additions & 12 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ on:
ref:
type: string
default: ${{ github.ref }}
app_id:
description: GitHub App ID for Auth (or client ID)
type: string
required: true
secrets:
TOKEN:
app_secret:
description: GitHub App client secret for Auth
required: true

jobs:
Expand All @@ -25,16 +30,23 @@ jobs:
- branch: master
webpack: update
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: plugins/plugin_ABDesigner
ref: ${{ inputs.ref }}
- name: Generate a token
id: generate-token
uses: actions/create-github-app-token@v2
with:
app-id: ${{ inputs.app_id }}
private-key: ${{ secrets.app_secret }}
repositories: ab_service_web

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: web
repository: digi-serve/ab_service_web
token: ${{ secrets.TOKEN }}
token: ${{ steps.generate-token.outputs.token }}
ref: ${{ matrix.branch }}

- run: npm i
Expand All @@ -52,7 +64,7 @@ jobs:
repository: digi-serve/ab_service_web

- name: Check out kitchen-sink tests
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: digi-serve/kitchensink_app
path: ab/test/e2e/cypress/e2e/kitchensink_app
Expand All @@ -63,13 +75,13 @@ jobs:
run: pm2 start ./logs.js -- --toFile logs/ABServices.log
working-directory: ./ab

- name: Wait for AB
# Skipping the wait step. Cypress has a bit of wait time built in.
if: false
uses: ifaxity/wait-on-action@v1.1.0
with:
resource: http://localhost:8080
timeout: 300000
# Skipping the wait step. Cypress has a bit of wait time built in.
# - name: Wait for AB
# if: false
# uses: ifaxity/wait-on-action@v1.1.0
# with:
# resource: http://localhost:8080
# timeout: 300000

- name: Run Cypress Tests
run: npm run test:e2e:ab-designer -- --browser chrome
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/merging-rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ on:
jobs:
e2e-tests:
uses: ./.github/workflows/e2e-test.yml
with:
app_id: ${{ vars.GS_DEV_APP_ID }}
secrets:
TOKEN: ${{ secrets.PAT }}
app_secret: ${{ secrets.GS_DEV_APP_PK }}
15 changes: 9 additions & 6 deletions .github/workflows/pr-merge-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
# Only run if the PR closed by merging and we have a label
if: ${{ needs.call-get-label.outputs.valid == 'true' }}
uses: ./.github/workflows/e2e-test.yml
with:
app_id: ${{ vars.GS_DEV_APP_ID }}
secrets:
TOKEN: ${{ secrets.PAT }}
TOKEN: ${{ secrets.GD_DEV_APP_PK }}
call-bump-version:
name: Version
# Only run if tests pass
Expand All @@ -33,13 +35,14 @@ jobs:
needs: [call-bump-version]
with:
tag: v${{ needs.call-bump-version.outputs.new_version }}
dispatch-web-update:
name: Dipsatch Web Service Update
call-dispatch-web-update:
needs: [ call-bump-version, call-get-label ]
uses: ./.github/workflows/dispatch-web-update.yml
uses: digi-serve/.github/.github/workflows/dispatch-update.yml@master
with:
dispatch_repos: '["ab_service_web"]'
dispatch_type: web_new_version
type: ${{ needs.call-get-label.outputs.label }}
version: ${{ needs.call-bump-version.outputs.new_version }}
repo: plugin_ABDesigner
app_id: ${{ vars.GS_DEV_APP_ID }}
secrets:
TOKEN: ${{ secrets.PAT }}
app_secret: ${{ secrets.GS_DEV_APP_PK }}
Loading