Add additional question text fields to form parameters

.cfignore

@@ -37,3 +37,11 @@
 /public/packs
 /public/packs-test
 /node_modules
+
+# Ignore Rust build artifacts, but keep the prebuilt widget library
+target/
+ext/widget_renderer/target/
+!ext/widget_renderer/target/
+!ext/widget_renderer/target/release/
+!ext/widget_renderer/target/release/libwidget_renderer.so
+!ext/widget_renderer/libwidget_renderer.so

.circleci/config.yml

@@ -3,13 +3,16 @@
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 #
 version: 2.1
-orbs:
-  browser-tools: circleci/browser-tools@1.5.0
+
+# Cancel redundant builds when new commits are pushed
+# This prevents multiple pipelines from racing to deploy
+# Note: This must also be enabled in CircleCI project settings
+# Settings > Advanced > Auto-cancel redundant builds
 
 jobs:
   build:
     docker:
-       - image: cimg/ruby:3.3.4-browsers
+       - image: cimg/ruby:3.2.8-browsers # Matches deployed Ruby version in CF
          environment:
             RAILS_ENV: test
             PGHOST: 127.0.0.1
@@ -27,19 +30,37 @@ jobs:
             POSTGRES_USER: root
             POSTGRES_DB: touchpoints_test
 
-    parallelism: 1
+    parallelism: 4
     working_directory: ~/repo
 
     steps:
       - run:
           name: Update packages
           command: sudo apt-get update
 
-      - browser-tools/install-chrome: # required for selenium used by tachometer benchmark smoke tests
-          chrome-version: 116.0.5845.96
+      - run:
+          name: Ensure Chrome is available
+          command: |
+            # cimg/ruby:*-browsers images already include Chrome; skip orb command to avoid "Cannot find declaration" errors
+            echo "Using cimg/ruby:3.4.7-browsers which includes Chrome"
 
       - checkout
 
+      - run:
+          name: Install Rust toolchain
+          command: |
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
+            echo 'source $HOME/.cargo/env' >> $BASH_ENV
+            source $HOME/.cargo/env
+            rustc --version
+            cargo --version
+
+      - run:
+          name: Build widget renderer (Rust)
+          command: |
+            source $HOME/.cargo/env
+            cargo build --release --manifest-path ext/widget_renderer/Cargo.toml
+
       # Download and cache dependencies
       - restore_cache:
           keys:
@@ -90,11 +111,37 @@ jobs:
 
       - run:
           name: Deploy Sidekiq worker servers
-          command: ./.circleci/deploy-sidekiq.sh
+          command: |
+            # Only deploy from a single parallel node to avoid concurrent CF pushes.
+            if [ "${CIRCLE_NODE_INDEX:-0}" != "0" ]; then
+              echo "Skipping Sidekiq deploy on parallel node ${CIRCLE_NODE_INDEX}"
+              exit 0
+            fi
+            # Remove prebuilt Rust library - it must be built on CF with the correct Ruby paths
+            # The library built on CircleCI links against /usr/local/lib/libruby.so.3.2
+            # but on CF, Ruby is in /home/vcap/deps/*/ruby/lib/
+            echo "Removing prebuilt Rust library (will be rebuilt on CF)..."
+            rm -rf ext/widget_renderer/target/release/libwidget_renderer.so 2>/dev/null || true
+            rm -f ext/widget_renderer/libwidget_renderer.so 2>/dev/null || true
+            ./.circleci/deploy-sidekiq.sh
+          no_output_timeout: 30m
 
       - run:
           name: Deploy web server(s)
-          command: ./.circleci/deploy.sh
+          command: |
+            # Only deploy from a single parallel node to avoid concurrent CF pushes.
+            if [ "${CIRCLE_NODE_INDEX:-0}" != "0" ]; then
+              echo "Skipping web deploy on parallel node ${CIRCLE_NODE_INDEX}"
+              exit 0
+            fi
+            # Wait for Sidekiq deployment to complete before starting web deploy
+            sleep 120
+            # Remove prebuilt Rust library - it must be built on CF with the correct Ruby paths
+            echo "Removing prebuilt Rust library (will be rebuilt on CF)..."
+            rm -rf ext/widget_renderer/target/release/libwidget_renderer.so 2>/dev/null || true
+            rm -f ext/widget_renderer/libwidget_renderer.so 2>/dev/null || true
+            ./.circleci/deploy.sh
+          no_output_timeout: 30m
 
   cron_tasks:
     docker:
@@ -112,7 +159,6 @@ jobs:
           command: ./.circleci/cron.sh
 
 workflows:
-  version: 2
   daily_workflow:
     triggers:
       - schedule:

.circleci/deploy-sidekiq.sh

@@ -4,13 +4,135 @@
 # a non-zero exit code
 set -e
 
+# Acquire a deployment lock using CF environment variable
+# This prevents multiple pipelines from deploying simultaneously
+acquire_deploy_lock() {
+  local app_name="$1"
+  local lock_name="DEPLOY_LOCK"
+  local lock_value="${CIRCLE_BUILD_NUM:-$$}_$(date +%s)"
+  local max_wait=600  # 10 minutes max
+  local wait_interval=30
+  local waited=0
+
+  echo "Attempting to acquire deploy lock for $app_name..."
+
+  while [ $waited -lt $max_wait ]; do
+    # Check if there's an existing lock
+    local current_lock=$(cf env "$app_name" 2>/dev/null | grep "$lock_name:" | awk '{print $2}' || echo "")
+
+    if [ -z "$current_lock" ] || [ "$current_lock" == "null" ]; then
+      # No lock exists, try to acquire it
+      echo "Setting deploy lock: $lock_value"
+      cf set-env "$app_name" "$lock_name" "$lock_value" > /dev/null 2>&1 || true
+      sleep 5  # Small delay to handle race conditions
+
+      # Verify we got the lock
+      current_lock=$(cf env "$app_name" 2>/dev/null | grep "$lock_name:" | awk '{print $2}' || echo "")
+      if [ "$current_lock" == "$lock_value" ]; then
+        echo "Deploy lock acquired: $lock_value"
+        return 0
+      fi
+    fi
+
+    # Check if lock is stale (older than 15 minutes)
+    local lock_time=$(echo "$current_lock" | cut -d'_' -f2)
+    local now=$(date +%s)
+    if [ -n "$lock_time" ] && [ $((now - lock_time)) -gt 900 ]; then
+      echo "Stale lock detected (age: $((now - lock_time))s), clearing..."
+      cf unset-env "$app_name" "$lock_name" > /dev/null 2>&1 || true
+      continue
+    fi
+
+    echo "Deploy lock held by another process ($current_lock), waiting ${wait_interval}s... (waited ${waited}s)"
+    sleep $wait_interval
+    waited=$((waited + wait_interval))
+  done
+
+  echo "Warning: Could not acquire lock after ${max_wait}s, proceeding anyway..."
+  return 0
+}
+
+# Release the deployment lock
+release_deploy_lock() {
+  local app_name="$1"
+  local lock_name="DEPLOY_LOCK"
+  echo "Releasing deploy lock for $app_name..."
+  cf unset-env "$app_name" "$lock_name" > /dev/null 2>&1 || true
+}
+
+# Wait for any in-progress deployments to complete before starting
+wait_for_deployment() {
+  local app_name="$1"
+  local max_wait=600  # 10 minutes max
+  local wait_interval=15
+  local waited=0
+
+  echo "Checking for in-progress deployments of $app_name..."
+
+  while [ $waited -lt $max_wait ]; do
+    # Get deployment status - look for ACTIVE deployments
+    local status=$(cf curl "/v3/deployments?app_guids=$(cf app "$app_name" --guid)&status_values=ACTIVE" 2>/dev/null | grep -o '"state":"[^"]*"' | head -1 || echo "")
+
+    if [ -z "$status" ] || [[ "$status" == *'"state":"FINALIZED"'* ]] || [[ "$status" == *'"state":"DEPLOYED"'* ]]; then
+      echo "No active deployment in progress, proceeding..."
+      return 0
+    fi
+
+    echo "Deployment in progress ($status), waiting ${wait_interval}s... (waited ${waited}s of ${max_wait}s)"
+    sleep $wait_interval
+    waited=$((waited + wait_interval))
+  done
+
+  echo "Warning: Timed out waiting for previous deployment, proceeding anyway..."
+  return 0
+}
+
+# Retry function to handle staging and deployment conflicts
+cf_push_with_retry() {
+  local app_name="$1"
+  local max_retries=5
+  local retry_delay=90
+
+  # Acquire lock first
+  acquire_deploy_lock "$app_name"
+
+  # Ensure lock is released on exit
+  trap "release_deploy_lock '$app_name'" EXIT
+
+  # Wait for any in-progress deployment
+  wait_for_deployment "$app_name"
+
+  for i in $(seq 1 $max_retries); do
+    echo "Attempt $i of $max_retries to push $app_name..."
+    if cf push "$app_name" --strategy rolling; then
+      echo "Successfully pushed $app_name"
+      release_deploy_lock "$app_name"
+      trap - EXIT  # Clear the trap
+      return 0
+    else
+      local exit_code=$?
+      if [ $i -lt $max_retries ]; then
+        echo "Push failed (exit code: $exit_code), waiting ${retry_delay}s before retry..."
+        sleep $retry_delay
+        # Re-check for in-progress deployments before retrying
+        wait_for_deployment "$app_name"
+      fi
+    fi
+  done
+
+  release_deploy_lock "$app_name"
+  trap - EXIT  # Clear the trap
+  echo "Failed to push $app_name after $max_retries attempts"
+  return 1
+}
+
 if [ "${CIRCLE_BRANCH}" == "production" ]
 then
   echo "Logging into cloud.gov"
   # Log into CF and push
   cf login -a $CF_API_ENDPOINT -u $CF_PRODUCTION_SPACE_DEPLOYER_USERNAME -p $CF_PRODUCTION_SPACE_DEPLOYER_PASSWORD -o $CF_ORG -s prod
   echo "PUSHING to PRODUCTION..."
-  cf push touchpoints-production-sidekiq-worker --strategy rolling
+  cf_push_with_retry touchpoints-production-sidekiq-worker
   echo "Push to Production Complete."
 else
   echo "Not on the production branch."
@@ -22,7 +144,7 @@ then
   # Log into CF and push
   cf login -a $CF_API_ENDPOINT -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE
   echo "Pushing to Demo..."
-  cf push touchpoints-demo-sidekiq-worker --strategy rolling
+  cf_push_with_retry touchpoints-demo-sidekiq-worker
   echo "Push to Demo Complete."
 else
   echo "Not on the main branch."
@@ -34,7 +156,7 @@ then
   # Log into CF and push
   cf login -a $CF_API_ENDPOINT -u $CF_USERNAME -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE
   echo "Pushing to Staging..."
-  cf push touchpoints-staging-sidekiq-worker --strategy rolling
+  cf_push_with_retry touchpoints-staging-sidekiq-worker
   echo "Push to Staging Complete."
 else
   echo "Not on the develop branch."