Skip to content

Commit

Permalink
temporarily disable gating tests and remove basename
Browse files Browse the repository at this point in the history
  • Loading branch information
shlokamin committed Sep 16, 2024
1 parent 4ddd1cf commit 112a7fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pd-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
run: make -C protocol-designer test-e2e
build-pd:
name: 'build protocol designer artifact'
needs: ['js-unit-test']
# needs: ['js-unit-test']
runs-on: 'ubuntu-22.04'
if: github.event_name != 'pull_request'
steps:
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
deploy-pd:
name: 'deploy PD artifact to S3'
runs-on: 'ubuntu-22.04'
needs: ['js-unit-test', 'build-pd']
needs: [ 'build-pd']
if: github.event_name != 'pull_request'
steps:
- uses: 'actions/checkout@v3'
Expand Down
14 changes: 1 addition & 13 deletions protocol-designer/src/ProtocolEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,22 @@ import { Bouncing } from './Bouncing'
import styles from './components/ProtocolEditor.module.css'
import './css/reset.module.css'

import type { BrowserRouterProps } from 'react-router-dom'

const showGateModal =
process.env.NODE_ENV === 'production' || process.env.OT_PD_SHOW_GATE

// sandbox urls get deployed to subdirectories in sandbox.designer.opentrons.com/${subFolder}
// prod urls get deployed to designer.opentrons.com with no subdir, so we don't need to add a base name
const routerBaseName =
process.env.NODE_ENV === 'production'
? null
: `/${window.location.pathname.split('/')[1]}`

function ProtocolEditorComponent(): JSX.Element {
const flags = useSelector(getFeatureFlagData)
const enableRedesign = useSelector(getEnableRedesign)

const prereleaseModeEnabled = flags.PRERELEASE_MODE === true

const browserRouterProps: BrowserRouterProps =
routerBaseName != null ? { basename: routerBaseName } : {}

return (
<div id="protocol-editor">
<TopPortalRoot />
{enableRedesign ? (
<Flex flexDirection={DIRECTION_COLUMN}>
{prereleaseModeEnabled ? <Bouncing /> : null}
<HashRouter {...browserRouterProps}>
<HashRouter>
<ProtocolRoutes />
</HashRouter>
</Flex>
Expand Down

0 comments on commit 112a7fb

Please sign in to comment.