Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(app): fix CI after release merge back #13816

Merged
merged 2 commits into from
Oct 19, 2023
Merged

fix(app): fix CI after release merge back #13816

merged 2 commits into from
Oct 19, 2023

Conversation

shlokamin
Copy link
Member

@shlokamin shlokamin commented Oct 19, 2023

Overview

CI checks failed after the 7.0.1 merge back into edge, this PR fixes them.

Review Requests

Make sure the protocol details component on desktop looks right (and also sanity check my deletions in code)

@shlokamin shlokamin requested a review from a team as a code owner October 19, 2023 19:49
@shlokamin shlokamin requested review from TamarZanzouri and removed request for a team October 19, 2023 19:49
@codecov
Copy link

codecov bot commented Oct 19, 2023

Codecov Report

Merging #13816 (0bfc2fb) into edge (e3e82e8) will decrease coverage by 0.05%.
The diff coverage is 25.00%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #13816      +/-   ##
==========================================
- Coverage   70.70%   70.66%   -0.05%     
==========================================
  Files        2472     2477       +5     
  Lines       69265    69666     +401     
  Branches     8331     8453     +122     
==========================================
+ Hits        48977    49232     +255     
- Misses      18344    18448     +104     
- Partials     1944     1986      +42     
Flag Coverage Δ
app 68.14% <25.00%> (-0.11%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx 78.75% <ø> (+2.69%) ⬆️
...s/Devices/ProtocolRun/SetupModuleAndDeck/index.tsx 87.50% <ø> (+4.16%) ⬆️
...anisms/Devices/hooks/useModuleCalibrationStatus.ts 100.00% <100.00%> (ø)
app/src/organisms/ProtocolDetails/index.tsx 42.10% <14.28%> (-9.37%) ⬇️

... and 59 files with indirect coverage changes

Copy link
Contributor

@brenthagen brenthagen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sanity check: sane

Copy link
Contributor

@mjhuff mjhuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I went back and tested the error boundary - it appears to be working. The ProtocolDetails page looks to be styled correctly, and the new rounded tab is there.

@shlokamin shlokamin merged commit c8d3454 into edge Oct 19, 2023
21 of 22 checks passed
y3rsh added a commit that referenced this pull request Oct 25, 2023
* edge: (77 commits)
  fix(app): update move gantry text in change pipette flow (#13712)
  fix(app): fix CI after release merge back (#13816)
  chore(hardware): add opentrons hardware package to ot 2 build (#13770)
  feat(protocol-designer): correct step count in create file wizard (#13807)
  feat(protocol-designer): error handling in create file wizard (#13804)
  fix(app): invalidate OT2 calibration queries when calibration flows complete (#13809)
  always jog (#13806)
  chore(app): point updates at dns not s3 (#13798)
  docs(api): updated Flex default flow rates (#13796)
  fix(api): Flag pipette as not ready to aspirate after pushing out air (#13728)
  fix(api, hardware): allow OT3Controller to disable tip motors (#13805)
  more blank trials; longer scale stabilize wait; submerge 2.5mm (#13788)
  fix(app): unload adapters after checking position of labware on adapter on heater shaker module (#13803)
  feat(app): wire up location conflict modal for ODD (#13797)
  feat(app): add Deck configuration page component (#13784)
  fix(robot-server): add default to robot serial (#13802)
  feat(protocol-designer, components): prep work for deck config in PD (#13775)
  feat(app, protocol-designer): plug in waste chute asset (#13800)
  fix(app): do not check mag block in calibration status (#13799)
  feat(protocol-designer): edit additional items staging area support (#13752)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants