Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into rs-manager-mode-poc
Browse files Browse the repository at this point in the history
* origin/main: (40 commits)
  Add playwright report task (#7946)
  [PROTO-1717] Clean up DDEX e2e with table tests (#7935)
  Fix sign up toasts not going away (#7944)
  Bump version to 0.6.67
  Remove Probers project and Cypress (#7923)
  [C-4017] Small fixes for ssr profile page rendering (#7937)
  [C-4065, C-4067] Update sdk instances in ssr files to avoid http provider errors (#7930)
  [C-4070] Improve sign-up page for various screen sizes (#7938)
  [ONC-58] Add next param to opensea requests (#7936)
  [INF-594] Add e2e tests for sdk example app (#7917)
  [C-4019] Fix web track menu options (#7934)
  [C-4066] Fix edit-collectibles modal spacing (#7925)
  Add Playwright for Web E2E Testing (#7922)
  add child logger to relay (#7927)
  Update mobile app versions for release .73 (#7931)
  Fix prepare transfer copy (#7929)
  Expire cached Solana transactions (#7926)
  v1.5.73
  Change internal sdk deps back to wildcard version (#7928)
  [C-4026, C-4059] Update profile page to render basic info and pictures on the server side (#7915)
  ...
  • Loading branch information
schottra committed Mar 26, 2024
2 parents b1f83e9 + 0ae0170 commit 46ef43f
Show file tree
Hide file tree
Showing 287 changed files with 4,262 additions and 5,662 deletions.
6 changes: 2 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
- ./node_modules
- ./packages/web/node_modules
- ./packages/mobile/node_modules
- ./packages/probers/node_modules
- ./packages/embed/node_modules
- ./packages/harmony/node_modules
- ./packages/common/node_modules
Expand Down Expand Up @@ -472,7 +471,6 @@ workflows:
packages/discovery-provider/.* run-discovery-workflow true
packages/web/.* run-web-workflow true
packages/mobile/.* run-mobile-workflow true
packages/probers/.* run-web-workflow true
packages/embed/.* run-embed-workflow true
packages/common/.* run-common-workflow true
packages/common/.* run-web-workflow true
Expand All @@ -491,6 +489,7 @@ workflows:
packages/libs/.* run-web-workflow true
packages/libs/.* run-mobile-workflow true
packages/libs/.* run-embed-workflow true
packages/libs/.* run-create-audius-app-workflow true
packages/create-audius-app/.* run-create-audius-app-workflow true
requires:
- generate-config
Expand All @@ -514,7 +513,6 @@ workflows:
.* run-release-workflow false
.* run-sdk-workflow true
.* run-harmony-workflow true
.* run-probers-workflow true
.* run-ddex-stage-workflow true
.circleci/.* run-web-workflow true
.circleci/.* run-mobile-workflow true
Expand All @@ -526,6 +524,7 @@ workflows:
packages/eslint-config-audius/.* run-mobile-workflow true
packages/libs/.* run-web-workflow true
packages/libs/.* run-mobile-workflow true
packages/libs/.* run-create-audius-app-workflow true
packages/harmony/.* run-web-workflow true
packages/harmony/.* run-mobile-workflow true
packages/mobile/.* run-mobile-workflow true
Expand Down Expand Up @@ -570,7 +569,6 @@ workflows:
.* run-web-workflow true
.* run-mobile-workflow true
.* run-harmony-workflow true
.* run-probers-workflow false
.* run-protocol-dashboard-workflow true
requires:
- generate-config
Expand Down
18 changes: 1 addition & 17 deletions .circleci/src/@continue_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ orbs:
slack: circleci/slack@4.12.0
aws-cli: circleci/aws-cli@3.1.5
ruby: circleci/ruby@1.2.0
cypress: cypress-io/cypress@3.3.1
browser-tools: circleci/browser-tools@1.4.4
newman: postman/newman@1.0.0
swissknife: roopakv/swissknife@0.69.0

# the default pipeline parameters, which will be updated according to
# the results of the path-filtering orb in config.yml
Expand Down Expand Up @@ -52,9 +52,6 @@ parameters:
run-mobile-workflow:
type: boolean
default: false
run-probers-workflow:
type: boolean
default: false
run-embed-workflow:
type: boolean
default: false
Expand All @@ -79,16 +76,3 @@ parameters:
run-create-audius-app-workflow:
type: boolean
default: false
# Can enable recurring probers against stage at some point
# workflows:
# version: 2.1
# hourly:
# triggers:
# - schedule:
# cron: '17 * * * *'
# filters:
# branches:
# only:
# - main
# jobs:
# - probers-test-stage
27 changes: 27 additions & 0 deletions .circleci/src/jobs/@create-audius-app-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,30 @@ create-audius-app-test:
name: 'test'
command: |
npx turbo run test --filter=create-audius-app
create-audius-app-test-e2e:
working_directory: ~/audius-protocol
resource_class: medium
docker:
- image: cimg/node:18.17
steps:
- checkout
- attach_workspace:
at: ./
- run:
name: 'test-e2e'
command: |
npx playwright install --with-deps
npm run setup-test-env -w create-audius-app
cd packages/create-audius-app/examples/react
npm i
npm run build
cd ../../
npm run test:e2e
- store_test_results:
path: packages/create-audius-app/report.xml
when: always
- store_artifacts:
path: packages/create-audius-app/playwright-report
- store_artifacts:
path: packages/create-audius-app/blob-report
12 changes: 0 additions & 12 deletions .circleci/src/jobs/@probers-jobs.yml

This file was deleted.

53 changes: 39 additions & 14 deletions .circleci/src/jobs/@web-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ web-init:
paths:
- node_modules
- packages/web/node_modules
- packages/probers/node_modules
- packages/harmony/node_modules
- packages/harmony/dist
- packages/common/node_modules
Expand Down Expand Up @@ -91,26 +90,52 @@ web-build-ssr-staging:
paths:
- node_modules/@brillout/vite-plugin-import-build/dist

web-test-staging:
playwright-tests:
working_directory: ~/audius-protocol
resource_class: large
executor: cypress/default
resource_class: medium
parallelism: 4
docker:
- image: cimg/node:18.17
steps:
- checkout
- attach_workspace:
at: ./
- cypress/install:
install-command: 'npx cypress install'
install-browsers: true
working-directory: ~/audius-protocol/packages/probers
- cypress/run-tests:
cypress-command: 'npx cypress run --browser chrome'
start-command: 'cd ../.. ; npm run web:stage'
working-directory: ~/audius-protocol/packages/probers
- run: npx playwright install --with-deps
- run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; cd packages/web; npx playwright test --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
- store_test_results:
path: packages/web/report.xml
when: always
- store_artifacts:
path: /home/circleci/audius-protocol/packages/probers/cypress/videos
path: packages/web/blob-report

playwright-tests-report:
working_directory: ~/audius-protocol
docker:
- image: cimg/node:18.17
steps:
- swissknife/wait_for_job:
job-name: playwright-tests
- swissknife/get-job-number:
job-name: playwright-tests
- swissknife/get_job_artifacts:
job-number: SK_JOB_NUM
file-name-pattern: packages/web/blob-report/report-1.zip
save-to-directory: ./blob-report
- swissknife/get_job_artifacts:
job-number: SK_JOB_NUM
file-name-pattern: packages/web/blob-report/report-2.zip
save-to-directory: ./blob-report
- swissknife/get_job_artifacts:
job-number: SK_JOB_NUM
file-name-pattern: packages/web/blob-report/report-3.zip
save-to-directory: ./blob-report
- swissknife/get_job_artifacts:
job-number: SK_JOB_NUM
file-name-pattern: packages/web/blob-report/report-4.zip
save-to-directory: ./blob-report
- run: npx playwright merge-reports --reporter html ./blob-report
- store_artifacts:
path: /home/circleci/audius-protocol/packages/probers/cypress/screenshots
path: playwright-report

web-test:
working_directory: ~/audius-protocol
Expand Down
7 changes: 7 additions & 0 deletions .circleci/src/workflows/create-audius-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,10 @@ jobs:
- Vercel
requires:
- create-audius-app-init

- create-audius-app-test-e2e:
context:
- Vercel
- create-audius-app
requires:
- create-audius-app-init
10 changes: 8 additions & 2 deletions .circleci/src/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,18 @@ jobs:
branches:
only: /(^release.*)$/

- web-test-staging:
- playwright-tests:
context:
- Audius Client
- Probers
requires:
- web-init
- web-build-staging

- playwright-tests-report:
context:
- Probers
requires:
- web-build-staging

- web-test:
context: Audius Client
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,7 @@ combined-patch-file.txt
packages/identity-service/emailCache

# CloudFlare
.wrangler
.wrangler

# Playwright
test-results
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ For details on operating an Audius service, getting started with the Token and t
| [`identity-service`](packages/identity-service) | Stores encrypted auth ciphertexts and handles oauth artifacts |
| [`libs`](./packages/libs) | `@audius/sdk` and legacy shared utilities `libs` |
| [`mobile`](./packages/mobile) | The Audius reference mobile application |
| [`probers`](./packages/probers) | E2E web tests |
| [`solana-programs`](https://github.com/AudiusProject/audius-protocol/tree/main/solana-programs) | The Solana programs for the Audius protocol, encompassing user account, content listing, and content interaction functionality |
| [`spl`](./packages/spl) | Handles Solana instructions for the Audius programs |
| [`sql-ts`](./packages/sql-ts) | A typescript database client |
Expand Down
13 changes: 4 additions & 9 deletions dev-tools/audius-compose
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@ def build(
"--profile=block-explorer",
"--profile=uptime",
"--profile=ddex",
"--profile=ddex-release-by-release",
"--profile=ddex-batched",
"build",
*args,
*services,
Expand Down Expand Up @@ -522,7 +520,8 @@ def up(

if ddex_release_by_release or ddex_batched:
generate_ddex_mongo_key(protocol_dir)
profiles = [f"--profile=ddex-{'release-by-release' if ddex_release_by_release else 'batched'}"]
profiles = ["--profile=ddex"]
os.environ["DDEX_CHOREOGRAPHY"] = "ERNReleaseByRelease" if ddex_release_by_release else "ERNBatched"
else:
AAO_DIR = pathlib.Path(
os.getenv("AAO_DIR", protocol_dir / "../anti-abuse-oracle")
Expand Down Expand Up @@ -668,6 +667,7 @@ def test_run(protocol_dir, service, args):

if service.startswith("ddex"):
env["COMPOSE_PROFILES"] = "ddex"
env["DDEX_CHOREOGRAPHY"] = "ERNReleaseByRelease" if service.endswith("release") else "ERNBatched"
generate_ddex_mongo_key(protocol_dir)

result = subprocess.run(
Expand All @@ -688,12 +688,7 @@ def test_run(protocol_dir, service, args):
)

if result.returncode != 0 and service.startswith("ddex"):
containers = (
["ddex-crawler-release-by-release", "ddex-parser-release-by-release"]
if service.endswith("release")
else ["ddex-crawler-batched", "ddex-parser-batched"]
)
for container in containers:
for container in ["ddex-crawler", "ddex-parser"]:
logs_result = subprocess.run(
f"docker logs {container}",
shell=True,
Expand Down
12 changes: 0 additions & 12 deletions dev-tools/compose/docker-compose.ddex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ services:
- DDEX_PORT=9000
- DDEX_MONGODB_URL=mongodb://mongo:mongo@ddex-mongo:27017/ddex?authSource=admin&replicaSet=rs0
env_file: .env
depends_on:
ddex-mongo-init:
condition: service_completed_successfully
ports:
- "9000:9000"
networks:
Expand All @@ -32,9 +29,6 @@ services:
environment:
- DDEX_MONGODB_URL=mongodb://mongo:mongo@ddex-mongo:27017/ddex?authSource=admin&replicaSet=rs0
env_file: .env
depends_on:
ddex-mongo-init:
condition: service_completed_successfully
entrypoint: ./ingester --service crawler
healthcheck:
test: ["CMD-SHELL", "pgrep ./ingester || exit 1"]
Expand All @@ -54,9 +48,6 @@ services:
environment:
- DDEX_MONGODB_URL=mongodb://mongo:mongo@ddex-mongo:27017/ddex?authSource=admin&replicaSet=rs0
env_file: .env
depends_on:
ddex-mongo-init:
condition: service_completed_successfully
entrypoint: ./ingester --service parser
healthcheck:
test: ["CMD-SHELL", "pgrep ./ingester || exit 1"]
Expand All @@ -80,9 +71,6 @@ services:
environment:
- DDEX_MONGODB_URL=mongodb://mongo:mongo@ddex-mongo:27017/ddex?authSource=admin&replicaSet=rs0
env_file: .env
depends_on:
ddex-mongo-init:
condition: service_completed_successfully
ports:
- "9001:9001"
healthcheck:
Expand Down
Loading

0 comments on commit 46ef43f

Please sign in to comment.