Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: ci limits on building finsemble, and clean up #2332

Merged
merged 1 commit into from
Dec 4, 2024
Merged

chore: ci limits on building finsemble, and clean up #2332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions .github/workflows/branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,24 @@ jobs:
with:
project_id: ${{ secrets.GOOGLE_PROJECT_ID }}

- name: Restore cache
uses: actions/cache/restore@v4
id: cache-npm
with:
path: packages/client/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('packages/client/package-lock.json') }}

- name: Install dependencies
if: steps.cache-npm.outputs.cache-hit != 'true'
run: npm ci

- name: Cache node modules
if: steps.cache-npm.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
path: packages/client/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('packages/client/package-lock.json') }}

- name: Verify Quality (type checking, linting, format checking, tests)
run: npm run verify

Expand Down Expand Up @@ -90,6 +105,7 @@ jobs:
gs://$BUCKET_OPENFIN/branch/${{ steps.vars.outputs.BRANCH }}

- name: Build (Finsemble)
if: ${{ steps.vars.outputs.ENVIRONMENT == 'dev' || steps.vars.outputs.ENVIRONMENT == 'uat' }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only build Finsemble for Dev, UAT and Prod .. and consider dropping it entirely in the new year .. if we pick it up again (unlikely), we would probably look at using the io.Connect (i.e. rebadged Glue 42) product which has superseded Finsemble now (there is a migration path, I am told).

env:
DOMAIN: https://finsemble.${{ steps.vars.outputs.ENVIRONMENT }}.reactivetrader.com
URL_PATH: ${{ steps.vars.outputs.URL_SUFFIX }}
Expand All @@ -98,6 +114,7 @@ jobs:
run: npm run finsemble:build

- name: Deploy (Finsemble)
if: ${{ steps.vars.outputs.ENVIRONMENT == 'dev' || steps.vars.outputs.ENVIRONMENT == 'uat' }}
run: |
gsutil -m \
-h "Cache-Control: no-cache" \
Expand Down
37 changes: 4 additions & 33 deletions .github/workflows/e2e-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Reactive Trader Dev Weekday E2E

on:
schedule:
- cron: "00 8,10,12,14,16 * * 1-5"
- cron: "45 8 * * 1-5"

defaults:
run:
Expand All @@ -28,44 +28,15 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Test Dev
- name: Test
env:
E2E_RTC_WEB_ROOT_URL: https://web.dev.reactivetrader.com
run: npx playwright test --project=web credit.spec.ts
continue-on-error: true
run: npm run e2e:web

- name: Artifact Upload
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report-dev
path: packages/client/playwright-report/
retention-days: 7

- name: Test UAT
env:
E2E_RTC_WEB_ROOT_URL: https://web.uat.reactivetrader.com
run: npx playwright test --project=web credit.spec.ts
continue-on-error: true

- name: Artifact Upload
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report-uat
path: packages/client/playwright-report/
retention-days: 7

Copy link
Contributor Author

@algreasley algreasley Nov 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Start to wind back the relentless Credit E2E-ing we are doing atm, that I pushed directly to master a few days ago.
Web Credit seem to be working consistently, although I have done nothing to fix them - still had a few recent failures on PR branch, where the full E2E (including OpenFin) is run.
UAT deployment is the same commit as Prod, so no point in duplicating there.

- name: Test Prod
env:
E2E_RTC_WEB_ROOT_URL: https://web.prod.reactivetrader.com
run: npx playwright test --project=web credit.spec.ts
continue-on-error: true

- name: Artifact Upload
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report-prod
name: playwright-report
path: packages/client/playwright-report/
retention-days: 7
2 changes: 1 addition & 1 deletion .github/workflows/e2e-smoke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Reactive Trader Prod Daily E2E

on:
schedule:
- cron: "55 8 * * *"
- cron: "30 8 * * 1-5"

defaults:
run:
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/pull-fork.yml
View file
Open in desktop

This file was deleted.

22 changes: 3 additions & 19 deletions .github/workflows/pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ defaults:
env:
BUCKET_WEB: reactive-trader-web-builds
BUCKET_OPENFIN: reactive-trader-openfin-builds
BUCKET_FINSEMBLE: reactive-trader-finsemble-builds
ENVIRONMENT: env

jobs:
Expand Down Expand Up @@ -80,20 +79,6 @@ jobs:
rsync -d -r dist \
gs://$BUCKET_OPENFIN/pull/${{ github.event.number }}

- name: Build (Finsemble)
env:
DOMAIN: https://finsemble.env.reactivetrader.com
URL_PATH: /pull/${{ github.event.number }}
VITE_BUILD_VERSION: ${{ github.sha }}
run: npm run finsemble:build

- name: Deploy (Finsemble)
run: |
gsutil -m \
-h "Cache-Control: no-cache" \
rsync -d -r dist \
gs://$BUCKET_FINSEMBLE/pull/${{ github.event.number }}

- name: Find comment
uses: peter-evans/find-comment@v3
id: comment
Expand All @@ -120,7 +105,6 @@ jobs:
| OpenFin - Credit | fins://openfin.env.reactivetrader.com/pull/${{ github.event.number }}/config/rt-credit.json |
| OpenFin - Launcher | fins://openfin.env.reactivetrader.com/pull/${{ github.event.number }}/config/launcher.json |
| OpenFin - Workspace | fins://openfin.env.reactivetrader.com/pull/${{ github.event.number }}/workspace/config/workspace.json |
| Finsemble | https://finsemble.env.reactivetrader.com/pull/${{ github.event.number }} |

### Performance

Expand Down Expand Up @@ -156,7 +140,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report
name: playwright-report-web
path: packages/client/playwright-report/
retention-days: 7

Expand Down Expand Up @@ -191,7 +175,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report
name: playwright-report-of-fx
path: packages/client/playwright-report/
retention-days: 7

Expand Down Expand Up @@ -226,6 +210,6 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report
name: playwright-report-of-credit
path: packages/client/playwright-report/
retention-days: 7
7 changes: 0 additions & 7 deletions .github/workflows/tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@ jobs:
rsync -d -r dist \
gs://$BUCKET_OPENFIN/tag/${{ steps.vars.outputs.TAG }}

- name: Deploy (Launcher)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

about time we retired this .. very old installations used to point to launcher.prod.reactivetrader.com ..

run: |
gsutil -m \
-h "Cache-Control: no-cache" \
rsync -d -r dist \
gs://$BUCKET_LAUNCHER/tag/${{ steps.vars.outputs.TAG }}

- name: Build (Finsemble)
env:
DOMAIN: https://finsemble.prod.reactivetrader.com
Expand Down
5 changes: 2 additions & 3 deletions packages/client/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ Working with OpenFin workspace locally using the OpenFin CLI ...

`npm run openfin:dev` as above to serve RT apps, views and the workspace platform

`npm run workspace:run` to launch workspace (when running local dev server, you'll see the "provider" window first)
`npm run openfin:run:workspace` to launch workspace (when running local dev server, you'll see the "provider" window first)

As a shortcut, to run the local dev server and client in one command, use

```sh
npm run workspace:start
npm run openfin:start:workspace
```

#### Configs
Expand Down Expand Up @@ -262,7 +262,6 @@ npm run openfin:start:launcher
```

and launch all of the apps from the launcher
(RA E2E tests need to be run from the RA repo)

```sh
npm run e2e:openfin -- --workers=1
Expand Down
9 changes: 5 additions & 4 deletions packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,26 @@
"start": "vite",
"build": "vite build",
"serve": "vite preview",
"preview": "vite preview",
"openfin:dev": "cross-env TARGET=openfin vite",
"openfin:local": "npm run _runLocal --runcmd=\"TARGET=openfin vite\"",
"_openfin:run": "cross-env-shell \"wait-on -l $npm_config_manifest_url && openfin -l -c $npm_config_manifest_url\"",
"openfin:run:fx": "npm run _openfin:run --manifest_url=http://localhost:1917/config/rt-fx.json",
"openfin:run:credit": "npm run _openfin:run --manifest_url=http://localhost:1917/config/rt-credit.json",
"openfin:run:limitchecker": "npm run _openfin:run --manifest_url=http://localhost:1917/config/limit-checker.json",
"openfin:run:launcher": "npm run _openfin:run --manifest_url=http://localhost:1917/config/launcher.json",
"openfin:run:workspace": "npm run _openfin:run --manifest_url=http://localhost:1917/workspace/config/workspace.json",
"openfin:start:fx": "concurrently \"npm:openfin:dev\" \"npm:openfin:run:fx\"",
"openfin:start:fx:local": "concurrently \"npm:openfin:local\" \"npm:openfin:run:fx\"",
"openfin:start:credit": "concurrently \"npm:openfin:dev\" \"npm:openfin:run:credit\"",
"openfin:start:credit:local": "concurrently \"npm:openfin:local\" \"npm:openfin:run:credit\"",
"openfin:start:limitchecker": "concurrently \"npm:openfin:dev\" \"npm:openfin:run:limitchecker\"",
"openfin:start:launcher": "concurrently \"npm:openfin:dev\" \"npm:openfin:run:launcher\"",
"openfin:start:launcher:local": "concurrently \"npm:openfin:local\" \"npm:openfin:run:launcher\"",
"openfin:start:workspace": "concurrently \"npm:openfin:dev\" \"npm:workspace:run\"",
"openfin:build": "cross-env TARGET=openfin vite build",
"openfin:start:preview": "npm:openfin:build && concurrently \"npm:serve\" \"npm:openfin:run:launcher\"",
"workspace:run": "npm run _openfin:run --manifest_url=http://localhost:1917/workspace/config/workspace.json",
"workspace:start": "concurrently \"npm:openfin:dev\" \"npm:workspace:run\"",
"workspace:start:preview": "npm:openfin:build && concurrently \"npm:serve\" \"npm:workspace:run\"",
"openfin:preview:launcher": "npm:openfin:build && concurrently \"npm:serve\" \"npm:openfin:run:launcher\"",
"openfin:preview:workspace": "npm:openfin:build && concurrently \"npm:serve\" \"npm:workspace:run\"",
"finsemble:dev": "cross-env TARGET=finsemble vite",
"finsemble:build": "cross-env TARGET=finsemble vite build",
"storybook": "storybook dev -p 6006",
Expand Down