Merge back 'chore_release-8.5.1' into 'chore_release-pd-8.5.0' (#18980)

Author: ddcc4

.github/workflows/app-test-build-deploy.yaml

@@ -394,9 +394,23 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.OT_APP_ROBOTSTACK_SLACK_NOTIFICATION_WEBHOOK_URL }}
           _ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_ROBOTSTACK}}/${{env._APP_DEPLOY_FOLDER_ROBOTSTACK}}
 
+      - name: 'backup upload folders before checkout'
+        run: |
+          # Move upload folders to temp location to preserve them during checkout
+          mkdir -p ${{ runner.temp }}/upload_backup
+          mv to_upload_* ${{ runner.temp }}/upload_backup/ 2>/dev/null || true
       - name: 'pull repo for scripts'
         uses: 'actions/checkout@v4'
+      - name: 'restore upload folders after checkout'
+        run: |
+          # Restore upload folders from temp location
+          mv ${{ runner.temp }}/upload_backup/to_upload_* ./ 2>/dev/null || true
       - uses: ./.github/actions/js/setup
+      - name: 'print upload folders contents'
+        run: |
+          echo "Test Outputs"
+          echo "Contents of to_upload_internal-release: $(ls -l ./to_upload_internal-release)"
+          echo "Contents of to_upload_release: $(ls -l ./to_upload_release)"
       - name: 'update internal-releases releases.json'
         if: needs.determine-build-type.outputs.type == 'release' && contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')
         run: |

api/release-notes.md

@@ -8,6 +8,15 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons Robot Software Changes in 8.5.1
+
+The 8.5.1 hotfix release fixes two bugs:
+
+- Corrected behavior when performing multi-dispense actions using a custom or modified liquid class.
+- Fixed a problem where certain quick transfers (specifically ones that attempt to blow out over the waste chute) could not be run.
+
+---
+
 ## Opentrons Robot Software Changes in 8.5.0
 
 Welcome to the v8.5.0 release of the Opentrons robot software! This release features the ability to pipette more accurately by using liquid classes in your protocols.

app-shell/build/release-notes.md

@@ -8,6 +8,14 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons App Changes in 8.5.1
+
+Welcome to the v8.5.1 release of the Opentrons App!
+
+There are no changes to the Opentrons App in v8.5.1, but it is required for updating the robot software to improve some features.
+
+---
+
 ## Opentrons App Changes in 8.5.0
 
 Welcome to the v8.5.0 release of the Opentrons App! This release features the ability to run protocols that use liquid classes to improve pipetting accuracy.

step-generation/src/__tests__/distribute.test.ts

@@ -381,7 +381,7 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
       volume: 120,
       mixBeforeAspirate: { times: 2, volume: 50 },
       disposalVolume: 12,
-      blowoutLocation: SOURCE_LABWARE,
+      blowoutLocation: 'source_well',
     } as DistributeArgs
     const result = distribute(
       distributeArgs,
@@ -820,13 +820,53 @@ describe('advanced settings: volume, mix, pre-wet tip, tip touch, tip position',
       aspirateHelper('A1', aspirateVol),
       dispenseHelper('A2', volume),
       dispenseHelper('A3', volume),
-      blowoutSingleToSourceA1,
+      {
+        commandType: 'moveToAddressableArea',
+        key: expect.anything(),
+        params: {
+          addressableAreaName: 'movableTrashA3',
+          offset: {
+            x: 0,
+            y: 0,
+            z: 0,
+          },
+          pipetteId: 'p300SingleId',
+        },
+      },
+      {
+        commandType: 'blowOutInPlace',
+        key: expect.anything(),
+        params: {
+          flowRate: 2.3,
+          pipetteId: 'p300SingleId',
+        },
+      },
 
       ...mixCommands,
       aspirateHelper('A1', aspirateVol),
       dispenseHelper('A4', volume),
       dispenseHelper('A5', volume),
-      blowoutSingleToSourceA1,
+      {
+        commandType: 'moveToAddressableArea',
+        key: expect.anything(),
+        params: {
+          addressableAreaName: 'movableTrashA3',
+          offset: {
+            x: 0,
+            y: 0,
+            z: 0,
+          },
+          pipetteId: 'p300SingleId',
+        },
+      },
+      {
+        commandType: 'blowOutInPlace',
+        key: expect.anything(),
+        params: {
+          flowRate: 2.3,
+          pipetteId: 'p300SingleId',
+        },
+      },
     ])
   })