Merge remote-tracking branch 'origin/main' into pay-2932-cleanup-apic…

…lient * origin/main: (25 commits) [QA-1268] Fix sentry upload (#8432) [QA-1253] Improve details tile layout (#8433) [QA-1251] Fix short lineup playback issues. (#8402) fix ddex playlists UI (#8435) [PAY-2965, PAY-2968, PAY-2963] Album upload copy fixes; remove 'hidden' option (#8428) [PAY-2786] Clean up skeletons for collection page (#8427) Fix dog ear pt 3 (#8420) Audius Protocol v0.6.100 QA-1260: change content title to not say track (#8436) [Web] Implement Remove Manager flows [Manager Mode ] [PAY-2827] (#8413) [Web] [Common] Accounts You Manage flows; hook up Accounts Managing You to API (#8301) [QA-1267] Fix blank android tip screen (#8430) [QA-1259] Restrict OTP spam (#8426) [PAY-2985] Fix squished art in purchase modal (#8423) [PAY-2960] Change library filter title to Premium (#8422) fix ddex playlist release_date parsing (#8421) Fix web-test by resolving circular import (#8418) solana relay ip utils (#8415) Revert "Fix dog ear on track page" (#8416) Misc $album fixes (#8393) ...
AudiusProject · May 10, 2024 · d594eb6 · d594eb6
2 parents afc2644 + c6ae1a3
commit d594eb6
Show file tree

Hide file tree

Showing 92 changed files with 2,328 additions and 682 deletions.
diff --git a/.circleci/src/jobs/@integration-jobs.yml b/.circleci/src/jobs/@integration-jobs.yml
@@ -0,0 +1,71 @@
+integration-init:
+  working_directory: ~/audius-protocol
+  docker:
+    - image: cimg/node:18.17
+  steps:
+    - checkout
+    - attach_workspace:
+        at: ./
+
+    - create_concatenated_patch_file:
+        filename: combined-patch-file.txt
+
+    - restore_cache:
+        keys:
+          - cache-{{ checksum "package-lock.json" }}-{{ checksum "combined-patch-file.txt" }}
+
+    - persist_to_workspace:
+        root: ./
+        paths:
+          - node_modules
+          - packages/web/node_modules
+          - packages/harmony/node_modules
+          - packages/harmony/dist
+          - packages/common/node_modules
+          - packages/libs/node_modules
+          - packages/libs/dist
+          - packages/trpc-server/node_modules
+          - packages/trpc-server/dist
+
+integration-test:
+  machine: true
+  resource_class: audiusproject/gcp-n2-standard-4
+  working_directory: ~/audius-protocol
+  steps:
+    - checkout
+    - attach_workspace:
+        at: ./
+    - run:
+        name: setup
+        command: AUDIUS_DEV=false bash ./dev-tools/setup.sh
+    - run:
+        name: audius-compose up
+        command: . ~/.profile; audius-compose up --prod
+    - run:
+        name: audius-cmd test
+        no_output_timeout: 15m
+        command: |
+          . ~/.profile; audius-cmd test
+    - run:
+        name: verify sdk types
+        command: |
+          cd ~/audius-protocol/packages/libs
+          . ~/.profile
+          audius-compose connect --nopass
+          ./scripts/check-generated-types.sh
+    - run: sudo NEEDRESTART_MODE=l PLAYWRIGHT_BROWSERS_PATH=/home/circleci/.cache/ms-playwright npx playwright install --with-deps
+    - run: cd packages/web && RUN_AGAINST_LOCAL_STACK=true npx playwright test
+    - store_test_results:
+        path: packages/web/report.xml
+        when: always
+    - run:
+        command: cd packages/web && npx playwright merge-reports --reporter html ./blob-report
+        when: always
+    - store_artifacts:
+        path: packages/web/playwright-report
+    - run:
+        name: cleanup
+        no_output_timeout: 5m
+        command: . ~/.profile; audius-compose down
+        when: always
+    - docker-prune
diff --git a/.circleci/src/jobs/@web-jobs.yml b/.circleci/src/jobs/@web-jobs.yml
@@ -90,53 +90,6 @@ web-build-ssr-staging:
         paths:
           - node_modules/@brillout/vite-plugin-import-build/dist
 
-playwright-tests:
-  working_directory: ~/audius-protocol
-  resource_class: medium
-  parallelism: 4
-  docker:
-    - image: cimg/node:18.17
-  steps:
-    - checkout
-    - attach_workspace:
-        at: ./
-    - 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: 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: playwright-report
-
 web-test:
   working_directory: ~/audius-protocol
   docker:
@@ -293,26 +246,21 @@ web-deploy-sentry-sourcemaps:
     - checkout
     - attach_workspace:
         at: ./
-    - run:
-        name: install-sentry-cli
-        command: |
-          cd packages/web
-          npm install @sentry/cli
     - run:
         name: cut-sentry-release
         command: |
           cd packages/web
-          node_modules/.bin/sentry-cli --auth-token ${SENTRY_AUTH_TOKEN} releases --org audius --project audius-client new ${CIRCLE_SHA1}
+          ../../node_modules/.bin/sentry-cli --auth-token ${SENTRY_AUTH_TOKEN} releases --org audius --project audius-client new ${CIRCLE_SHA1}
     - run:
         name: upload-sourcemaps
         command: |
           cd packages/web
-          node_modules/.bin/sentry-cli --auth-token ${SENTRY_AUTH_TOKEN} releases --org audius --project audius-client files ${CIRCLE_SHA1} upload-sourcemaps --no-rewrite build-production/static/js
+          ../../node_modules/.bin/sentry-cli --auth-token ${SENTRY_AUTH_TOKEN} releases --org audius --project audius-client files ${CIRCLE_SHA1} upload-sourcemaps --no-rewrite build-production/static/js
     - run:
         name: finalize-release
         command: |
           cd packages/web
-          node_modules/.bin/sentry-cli --auth-token ${SENTRY_AUTH_TOKEN} releases --org audius --project audius-client finalize ${CIRCLE_SHA1}
+          ../../node_modules/.bin/sentry-cli --auth-token ${SENTRY_AUTH_TOKEN} releases --org audius --project audius-client finalize ${CIRCLE_SHA1}
 
 web-dist-mac-staging:
   working_directory: ~/audius-protocol

diff --git a/.circleci/src/jobs/test-audius-cmd.yml b/.circleci/src/jobs/test-audius-cmd.yml
diff --git a/.circleci/src/workflows/integration.yml b/.circleci/src/workflows/integration.yml
@@ -1,4 +1,8 @@
 when: << pipeline.parameters.run-integration-workflow >>
 jobs:
-  - test-audius-cmd:
+  - integration-init:
       context: Vercel
+  - integration-test:
+      context: Vercel
+      requires:
+        - integration-init
diff --git a/.circleci/src/workflows/web.yml b/.circleci/src/workflows/web.yml
@@ -52,20 +52,6 @@ jobs:
         branches:
           only: /(^release.*)$/
 
-  - playwright-tests:
-      context:
-        - Audius Client
-        - Probers
-        - Vercel
-      requires:
-        - web-build-staging
-
-  - playwright-tests-report:
-      context:
-        - Probers
-      requires:
-        - web-build-staging
-
   - web-test:
       context:
         - Audius Client

diff --git a/dev-tools/compose/docker-compose.dev-tools.prod.yml b/dev-tools/compose/docker-compose.dev-tools.prod.yml
@@ -49,3 +49,7 @@ services:
       FALLBACK_CREATOR_NODE_URL: 'http://creator-node:4000' # this should choose a random cn everytime this is run
     deploy:
       mode: global
+    volumes:
+      # Mount the directory for e2e tests so audius-cmd can output results of data seeding
+      # to files that can be read by the e2e tests
+      - ${PROJECT_ROOT}/packages/web/e2e:/app/packages/web/e2e
diff --git a/dev-tools/compose/docker-compose.test.yml b/dev-tools/compose/docker-compose.test.yml
@@ -409,7 +409,7 @@ services:
 
   test-identity-service-migrations:
     extends:
-      file: docker-compose.identity.prod.yml
+      file: docker-compose.identity.dev.yml
       service: identity-service
     command: sh -c "npm run db:migrate"
     environment:
@@ -426,11 +426,11 @@ services:
 
   test-identity-service:
     extends:
-      file: docker-compose.identity.prod.yml
+      file: docker-compose.identity.dev.yml
       service: identity-service
     build:
       context: ${PROJECT_ROOT}
-      dockerfile: ${PROJECT_ROOT}/packages/identity-service/Dockerfile.prod
+      dockerfile: ${PROJECT_ROOT}/packages/identity-service/Dockerfile.dev
     entrypoint: sh -c '[ ! "$$1" = "test" ] && echo $$(ls) && sleep inf || (shift; npx mocha "$$@")' -
     command: ''
     environment:

diff --git a/dev-tools/setup.sh b/dev-tools/setup.sh
@@ -39,9 +39,9 @@ debian | ubuntu)
         docker-ce-cli='5:24.0.5-1~ubuntu.22.04~jammy' \
         containerd.io \
         docker-buildx-plugin \
-        docker-compose-plugin='2.21.0-1~ubuntu.22.04~jammy' \
-        nodejs
+        docker-compose-plugin='2.21.0-1~ubuntu.22.04~jammy'
 
+    curl -fsSL https://raw.githubusercontent.com/tj/n/master/bin/n | sudo bash -s lts
 
     # Add user to docker group
     sudo usermod -aG docker "$USER"

diff --git a/mediorum/.version.json b/mediorum/.version.json
@@ -1,4 +1,4 @@
 {
-  "version": "0.6.99",
+  "version": "0.6.100",
   "service": "content-node"
 }