Skip to content

Commit

Permalink
Merge branch 'edge' of https://github.com/Opentrons/opentrons into ap…
Browse files Browse the repository at this point in the history
…p_command-annotations
  • Loading branch information
jbleon95 committed Dec 5, 2024
2 parents 03d53c4 + a714e8d commit c073b13
Show file tree
Hide file tree
Showing 5,102 changed files with 622,620 additions and 166,524 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
**/venv/**
.opentrons_config
**/tsconfig*.json
**/vite.config.ts
**/vite.config.mts
# prettier
**/package.json
**/CHANGELOG.md
!api/release-notes.md
!app-shell/build/release-notes.md
**/.yarn-cache/**

# components library
storybook-static
Expand All @@ -28,6 +29,9 @@ robot-server/**
shared-data/python/**
hardware-testing/**

# abr-testing don't format the json protocols
abr-testing/protocols/**

# analyses-snapshot-testing don't format the json protocols
analyses-snapshot-testing/files
# don't format the snapshots
Expand Down
29 changes: 28 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ module.exports = {
'prettier',
'plugin:json/recommended',
'plugin:storybook/recommended',
'plugin:react/jsx-runtime',
],

plugins: ['react', 'react-hooks', 'json', 'testing-library'],
plugins: ['react', 'react-hooks', 'json', 'testing-library', 'opentrons'],

rules: {
camelcase: 'off',
Expand Down Expand Up @@ -116,6 +117,12 @@ module.exports = {
],
},
},
{
files: ['./app/src/**/*.@(ts|tsx)'],
rules: {
'import/no-absolute-path': 'off',
},
},
{
files: [
'**/test/**.js',
Expand Down Expand Up @@ -161,5 +168,25 @@ module.exports = {
'no-restricted-imports': 'off',
},
},
// Apply tree-of-life import requirements to app as errors
{
files: ['./app/src/**/*.@(ts|tsx)'],
rules: {
'opentrons/no-imports-up-the-tree-of-life': 'error',
},
},
{
files: ['./protocol-designer/src/**/*.@(ts|tsx)'],
rules: {
'opentrons/no-imports-up-the-tree-of-life': 'warn',
},
},
// apply application structure import requirements to app
{
files: ['./app/src/**/*.@(ts|tsx)'],
rules: {
'opentrons/no-imports-across-applications': 'error',
},
},
],
}
1 change: 1 addition & 0 deletions .github/actions/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
odd-resource-analysis/dist/* binary
13 changes: 13 additions & 0 deletions .github/actions/odd-resource-analysis/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.DS_Store
.idea
*.log
tmp/

*.tern-port
node_modules/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
*.tsbuildinfo
.npm
.eslintcache
2 changes: 2 additions & 0 deletions .github/actions/odd-resource-analysis/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist/
node_modules/
15 changes: 15 additions & 0 deletions .github/actions/odd-resource-analysis/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'use strict'

module.exports = {
printWidth: 80, // default
tabWidth: 2, // default
useTabs: false, // default
semi: false,
singleQuote: true,
jsxSingleQuote: false, // default
trailingComma: 'es5',
bracketSpacing: true, // default
jsxBracketSameLine: false, // default
arrowParens: 'avoid', // default
endOfLine: 'lf',
}
27 changes: 27 additions & 0 deletions .github/actions/odd-resource-analysis/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: 'ODD Memory Usage Analysis'
description: >-
Analyzes memory usage trends across ODD versions using Mixpanel data.
Note that only processes with positive correlation or explicitly whitelisted processes are shown.
inputs:
mixpanel-user:
description: 'Mixpanel service account username'
required: true
mixpanel-secret:
description: 'Mixpanel service account password'
required: true
mixpanel-project-id:
description: 'Mixpanel project ID'
required: true
previous-version-count:
description: 'Number of previous versions to analyze'
required: false
default: '2'

outputs:
analysis-results:
description: 'JSON string containing the complete analysis results'

runs:
using: 'node16'
main: 'dist/index.js'
Loading

0 comments on commit c073b13

Please sign in to comment.