Merge branch 'main' into is-scheduled-release

AudiusProject · Dec 13, 2023 · 9723942 · 9723942
2 parents 7d17822 + 8213ebb
commit 9723942
Show file tree

Hide file tree

Showing 560 changed files with 13,460 additions and 68,928 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -80,7 +80,7 @@ jobs:
             - ./packages/common/node_modules
             - ./packages/libs/node_modules
             - ./packages/identity-service/node_modules
-            - ./packages/discovery-provider/es-indexer/node_modules
+            - ./packages/es-indexer/node_modules
 
   generate-release-branch:
     working_directory: ~/audius-protocol
@@ -188,7 +188,7 @@ jobs:
                   curl --request POST \
                     "https://circleci.com/api/v2/workflow/$workflow_id/approve/$job_id" \
                     --header "Circle-Token: $CIRCLE_DAILY_DEPLOY_API_TOKEN"
-                  
+
                   # Record approval for the Slack message
                   echo "<${job_url}|release-v$VERSION>" > /tmp/job_url.txt
               fi
@@ -233,7 +233,7 @@ jobs:
               curl -f -X POST -H 'Content-type: application/json' \
                 --data "$json_content" \
                 $SLACK_DAILY_DEPLOY_WEBHOOK
-              
+
               exit 1
             fi
       - run:
@@ -245,7 +245,7 @@ jobs:
               failure_content+="{ \"type\": \"section\", \"text\": { \"type\": \"plain_text\", \"text\": \"Failed to find job for today's SP release. If this was not intentional, please check for 'release-audius-docker-compose-trigger' in today's release branch.\n\" } }"
               failure_content+="]}"
               echo "Sending error message to Slack: $failure_content"
-              
+
               # Send Slack failure message
               curl -f -X POST -H 'Content-type: application/json' \
                 --data "$failure_content" \
@@ -260,7 +260,7 @@ jobs:
               git fetch --all
               VERSION=$(jq -r .version packages/discovery-provider/.version.json)
               cd ..
-              
+
               # Get the pipeline for the most recent commit on the release branch
                response=$(curl --request GET \
                 --url "https://circleci.com/api/v2/project/gh/AudiusProject/audius-protocol/pipeline?branch=release-v$VERSION" \
@@ -290,7 +290,7 @@ jobs:
                   json_content+="{ \"type\": \"section\", \"text\": { \"type\": \"mrkdwn\", \"text\": \"Release v$VERSION is ready for SPs! Please approve <$job_url|release-audius-docker-compose-trigger> and react to this message with :white_check_mark:\n\" } }"
                   json_content+="]}"
                   echo "Text to send to slack: $json_content"
-                  
+
                   # Send Slack message
                   curl -f -X POST -H 'Content-type: application/json' \
                     --data "$json_content" \
@@ -361,15 +361,13 @@ workflows:
             packages/identity-service/.* run-integration-workflow true
             eth-contracts/.* run-eth-contracts-workflow true
             monitoring/healthz/.* run-healthz-workflow true
-            monitoring/uptime/node-ui/.* run-d-ui-workflow true
             protocol-dashboard/.* run-protocol-dashboard-workflow true
             contracts/.* run-contracts-workflow true
             .circleci/.* run-discovery-workflow true
             .circleci/.* run-creator-workflow true
             .circleci/.* run-identity-workflow true
             .circleci/.* run-eth-contracts-workflow true
             .circleci/.* run-protocol-dashboard-workflow true
-            .circleci/.* run-d-ui-workflow true
             .circleci/.* run-healthz-workflow true
             .circleci/.* run-contracts-workflow true
             .circleci/.* run-sdk-workflow true
@@ -442,7 +440,6 @@ workflows:
             packages/web/.* run-web-workflow true
             packages/embed/.* run-embed-workflow true
             protocol-dashboard/.* run-protocol-dashboard-workflow true
-            monitoring/uptime/node-ui/.* run-d-ui-workflow true
             monitoring/healthz/.* run-healthz-workflow true
           requires:
             - generate-config

diff --git a/.circleci/src/@continue_config.yml b/.circleci/src/@continue_config.yml
@@ -67,9 +67,6 @@ parameters:
   run-protocol-dashboard-workflow:
     type: boolean
     default: false
-  run-d-ui-workflow:
-    type: boolean
-    default: false
   run-healthz-workflow:
     type: boolean
     default: false

diff --git a/.circleci/src/commands/@mobile-commands.yml b/.circleci/src/commands/@mobile-commands.yml
@@ -155,7 +155,9 @@ mobile-prepare-android:
         command: sudo gem install bundler:1.17.3
     - run:
         name: install pip
-        command: sudo apt install python3-pip
+        command: |
+          sudo apt update
+          sudo apt install python3-pip
     - restore_cache:
         key: 1-gems-{{ checksum "packages/mobile/android/Gemfile.lock" }}
     - run: cd packages/mobile/android && (bundle check || bundle install --path vendor/bundle)

diff --git a/.circleci/src/jobs/@d-ui-jobs.yml b/.circleci/src/jobs/@d-ui-jobs.yml
diff --git a/.circleci/src/jobs/@discovery-jobs.yml b/.circleci/src/jobs/@discovery-jobs.yml
@@ -49,7 +49,6 @@ lint-discovery-provider:
         root: ./
         paths:
           - node_modules
-          - packages/discovery-provider/es-indexer/node_modules
 
 test-discovery-api:
   working_directory: ~/audius-protocol

diff --git a/.circleci/src/workflows/d-ui.yml b/.circleci/src/workflows/d-ui.yml
diff --git a/.circleci/src/workflows/discovery.yml b/.circleci/src/workflows/discovery.yml
@@ -42,6 +42,13 @@ jobs:
       filters:
         branches:
           only: main
+  - push-docker-image:
+      name: push-es-indexer
+      context: [Vercel, dockerhub]
+      service: es-indexer
+      filters:
+        branches:
+          only: main
   - push-docker-image:
       name: push-trpc
       context: [Vercel, dockerhub]

diff --git a/.circleci/src/workflows/mobile.yml b/.circleci/src/workflows/mobile.yml
@@ -18,23 +18,29 @@ jobs:
           ignore: /(^main|^release.*)$/
 
   - mobile-build-upload-staging-ios:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
         branches:
           only: /^main$/
 
   - mobile-build-upload-releasecandidate-ios:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
         branches:
           only: /(^release.*)$/
 
   - mobile-build-upload-staging-releasecandidate-ios:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
@@ -50,7 +56,9 @@ jobs:
   #         only: /^main$/
 
   - mobile-build-upload-production-ios-if-full-release:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
@@ -84,23 +92,29 @@ jobs:
           ignore: /(^main|^release.*)$/
 
   - mobile-build-upload-staging-android:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
         branches:
           only: /^main$/
 
   - mobile-build-upload-releasecandidate-android:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
         branches:
           only: /(^release.*)$/
 
   - mobile-build-upload-staging-releasecandidate-android:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:
@@ -116,7 +130,9 @@ jobs:
   #         only: /^main$/
 
   - mobile-build-upload-production-android-if-full-release:
-      context: Audius Mobile Client
+      context:
+        - Audius Mobile Client
+        - slack-secrets
       requires:
         - mobile-init
       filters:

diff --git a/.circleci/src/workflows/release.yml b/.circleci/src/workflows/release.yml
@@ -40,6 +40,11 @@ jobs:
       context: [Vercel, dockerhub, slack-secrets]
       service: comms
       notify_slack_on_failure: true
+  - push-docker-image:
+      name: push-es-indexer
+      context: [Vercel, dockerhub, slack-secrets]
+      service: es-indexer
+      notify_slack_on_failure: true
   - push-docker-image:
       name: push-trpc
       context: [Vercel, dockerhub, slack-secrets]

diff --git a/.npmrc b/.npmrc
@@ -1,3 +1,8 @@
 # TODO: Remove legacy-peer-deps when all peerDependency conflicts
 # have been resolved in the dependency tree
-legacy-peer-deps=true
+legacy-peer-deps=true
+
+# ECONNRESET on npm i
+# possible fix: https://stackoverflow.com/a/61378723
+timeout=60000
+prefer-offline=true