Merge remote-tracking branch 'origin/main' into pay-2012-purchase-ana…

…lytics

* origin/main: (21 commits)
  Fix triggering patch-release workflow (#6447)
  Fix cooldown summary table (#6445)
  Fix $AUDIO purchase (#6446)
  Fix notifications (#6444)
  refactor: Tweak Harmony button API (#6430)
  [PAY-2063] Fix border colors (#6437)
  Bump version to 0.5.1
  Add Harmony completion check C-3246 (#6414)
  [PAY-2061] Hide table if no challenges summary (#6438)
  Add CI workflow to patch a SHA outside of release (#6439)
  Filter out usdc create notifs from endpoint (#6436)
  [C-3196] Add testing-library to harmony and harmony-native (#6432)
  Push dashboard in release workflow (#6433)
  Fix jupiter buy-audio flow (#6429)
  Fix setup-dev.sh for users without .bashrc (#6428)
  SummaryTable don't gray out last row if no SummaryItem (#6427)
  Upgrade to 0.5.0 (#6426)
  [PAY-2012] Add analytics for purchase start/success/failure (#6425)
  Fix failing root npm install (#6424)
  [C-3235] Fix rotating cover art (#6379)
  ...

.circleci/config.yml

@@ -13,6 +13,9 @@ parameters:
   workflow:
     type: string
     default: 'main'
+  patch-release-commit-sha:
+    type: string
+    default: ''
 
 commands:
   create_concatenated_patch_file:

.circleci/src/@continue_config.yml

@@ -42,6 +42,9 @@ parameters:
   run-release-workflow:
     type: boolean
     default: false
+  patch-release-commit-sha:
+    type: string
+    default: ''
 
   run-web-workflow:
     type: boolean

.circleci/src/jobs/deploy-foundation-nodes.yml

@@ -21,7 +21,14 @@ steps:
       command: |
         git clone --branch stage https://github.com/AudiusProject/audius-docker-compose.git audius-docker-compose
         cd audius-docker-compose
-        release_commit_hash=$(git log --all --grep="$CIRCLE_BRANCH auto-deploy" --pretty=format:"%H" -1)
+
+        # Use custom commit hash if provided. Otherwise, determine based on auto-deploy branch
+        if [ -n "<< pipeline.parameters.patch-release-commit-sha >>" ]; then
+          release_commit_hash=<< pipeline.parameters.patch-release-commit-sha >>
+        else
+          release_commit_hash=$(git log --all --grep="$CIRCLE_BRANCH auto-deploy" --pretty=format:"%H" -1)
+        fi
+
         git fetch origin foundation:foundation
         git checkout foundation
         git merge $release_commit_hash --no-edit

.circleci/src/jobs/release-audius-docker-compose.yml

@@ -21,7 +21,14 @@ steps:
       command: |
         git clone --branch foundation https://github.com/AudiusProject/audius-docker-compose.git audius-docker-compose
         cd audius-docker-compose
-        release_commit_hash=$(git log --all --grep="$CIRCLE_BRANCH auto-deploy" --pretty=format:"%H" -1)
+
+        # Use custom commit hash if provided. Otherwise, determine based on auto-deploy branch
+        if [ -n "<< pipeline.parameters.patch-release-commit-sha >>" ]; then
+          release_commit_hash=<< pipeline.parameters.patch-release-commit-sha >>
+        else
+          release_commit_hash=$(git log --all --grep="$CIRCLE_BRANCH auto-deploy" --pretty=format:"%H" -1)
+        fi
+
         git fetch origin main:main
         git checkout main
         git merge $release_commit_hash --no-edit

.circleci/src/workflows/discovery.yml

@@ -55,7 +55,7 @@ jobs:
       service: dashboard
       filters:
         branches:
-          only: /^main$/
+          only: main
   - push-docker-image:
       name: push-healthz
       context: [Vercel, dockerhub]
@@ -94,6 +94,7 @@ jobs:
         - push-pedalboard-sla-auditor
         - push-comms
         - push-trpc
+        - push-protocol-dashboard
         - push-healthz
       filters:
         branches:

.circleci/src/workflows/patch-release.yml

@@ -0,0 +1,16 @@
+when: << pipeline.parameters.patch-release-commit-sha >>
+jobs:
+  - deploy-foundation-nodes-trigger:
+      type: approval
+  - deploy-foundation-nodes:
+      context: github
+      requires:
+        - deploy-foundation-nodes-trigger
+  - release-audius-docker-compose-trigger:
+      requires:
+        - deploy-foundation-nodes
+      type: approval
+  - release-audius-docker-compose:
+      context: github
+      requires:
+        - release-audius-docker-compose-trigger

.circleci/src/workflows/release.yml

@@ -50,6 +50,11 @@ jobs:
       context: [GCP, dockerhub, slack-secrets]
       service: healthz
       notify_slack_on_failure: true
+  - push-docker-image:
+      name: push-protocol-dashboard
+      context: [GCP, dockerhub, slack-secrets]
+      service: dashboard
+      notify_slack_on_failure: true
 
   - release-github-draft-trigger:
       type: approval
@@ -87,6 +92,7 @@ jobs:
         - push-comms
         - push-trpc
         - push-healthz
+        - push-protocol-dashboard
 
   - deploy-foundation-nodes-trigger:
       requires:

dev-tools/setup-dev.sh

@@ -5,7 +5,7 @@
 # Install nvm and required node versions
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 source ~/.nvm/nvm.sh
-source ~/.bashrc
+[ -f "~/.bashrc" ] && source ~/.bashrc
 for dir in contracts eth-contracts packages/identity-service packages/libs; do
     cd "$PROTOCOL_DIR/$dir"
     nvm install

dev-tools/setup.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -exu pipefail
+set -exo pipefail
 
 [ -f "/etc/os-release" ] && source /etc/os-release
 case "$ID" in

mediorum/.version.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.4.38",
+  "version": "0.5.1",
   "service": "content-node"
 }