houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable disabled lint rules and right-size CI runners (#18461)

Browse Source 
## Summary

- Re-enable one lint rule that was temporarily disabled during the
ESLint-to-Oxlint migration:
- **`twenty/sort-css-properties-alphabetically`** in twenty-front — 578
violations auto-fixed across 390 files
- Document why **`typescript/consistent-type-imports`** cannot be
auto-fixed in twenty-server: NestJS relies on `emitDecoratorMetadata`
for DI, so converting constructor parameter imports to `import type`
erases them at compile time and breaks dependency injection at runtime
- Right-size CI runners, reducing 8-core usage from 18 jobs to 3:

| Change | Jobs | Rationale |
|--------|------|-----------|
| **Keep 8-core** | `ci-merge-queue/e2e-test`,
`ci-front/front-sb-build`, `ci-front/front-build` | Heavy builds needing
max CPU + memory (10GB NODE_OPTIONS, full Storybook webpack bundling) |
| **8-core → 4-core** | `ci-server` (build, lint-typecheck, validation,
test, integration-test), `ci-front/front-sb-test`,
`ci-zapier/server-setup`, `ci-sdk/sdk-e2e-test` | Already sharded into
10-12 parallel instances, I/O-bound (DB/Redis), or moderate single
builds |
| **8-core → 2-core** | `ci-emails/emails-test` | Trivially lightweight
(build + curl health check) |
| **Removed** | `ci-front/front-chromatic-deployment` | Dead code —
permanently disabled with `if: false` |

- Fix merge queue CI issues:
- **Concurrency**: Use `merge_group.base_ref` instead of unique merge
group ref so new queue entries cancel previous runs
- **Required status checks**: Add `merge_group` trigger to all 6
required CI workflows (front, server, shared, website, docker-compose,
sdk) with `changed-files-check` auto-skipped for merge_group events —
status check jobs auto-pass without re-running full CI
- **Build caching**: Add Nx build cache restore/save to E2E test job
with fallback to `main` branch cache for faster frontend and server
builds

## Test plan

- [ ] CI passes on this PR (verifies lint rule auto-fix works)
- [ ] Verify 4-core runner jobs complete within their 30-minute timeouts
- [ ] Verify merge queue status checks auto-pass (ci-front-status-check,
ci-server-status-check, etc.)
- [ ] Verify merge queue E2E concurrency cancels previous runs when a
new PR enters the queue
This commit is contained in:
Charles Bochet
2026-03-06 14:33:02 +01:00
committed by GitHub
parent 9f9a6a45dd
commit ef499b6d47
404 changed files with 1755 additions and 1738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
+1 -1
View File
@@ -56,10 +56,10 @@ const StyledInputsContainer = styled.div`
const StyledAdvancedSettingsSectionInputWrapper = styled.div`
display: flex;
flex: 1;
flex-direction: column;
gap: ${themeCssVariables.spacing[4]};
width: 100%;
flex: 1;
`;
const StyledAdvancedSettingsOuterContainer = styled.div`
packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
+1 -1
View File
@@ -43,9 +43,9 @@ const StyledTypeSelectContainer = styled.div`
const StyledContainer = styled.div`
display: flex;
flex-wrap: wrap;
gap: ${themeCssVariables.spacing[2]};
justify-content: flex-start;
flex-wrap: wrap;
width: 100%;
`;
packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationPreviewContent.tsx
+1 -1
View File
@@ -3,8 +3,8 @@ import { type ReactNode } from 'react';
const StyledPreviewContent = styled.div<{ isMobile: boolean }>`
display: flex;
gap: 6px;
flex-direction: ${({ isMobile }) => (isMobile ? 'column' : 'row')};
gap: 6px;
`;
export const SettingsDataModelFieldRelationPreviewContent = ({
packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationPreviewImageCard.tsx
+1 -1
View File
@@ -4,6 +4,7 @@ const StyledRelationImage = styled.img<{
flip?: boolean;
isMobile: boolean;
}>`
margin: auto;
transform: ${({ flip, isMobile }) => {
let transform = '';
if (isMobile) {
@@ -14,7 +15,6 @@ const StyledRelationImage = styled.img<{
}
return transform.trim();
}};
margin: auto;
width: 54px;
`;
packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
+8 -8
View File
@@ -81,12 +81,12 @@ const StyledOptionsLabel = styled.div<{
font-size: ${themeCssVariables.font.size.xs};
font-weight: ${themeCssVariables.font.weight.semiBold};
margin-bottom: ${themeCssVariables.spacing['1.5']};
margin-top: ${themeCssVariables.spacing[1]};
width: 100%;
margin-left: ${({ isAdvancedModeEnabled, isBulkInputMode }) =>
isAdvancedModeEnabled && !isBulkInputMode
? themeCssVariables.spacing[10]
: themeCssVariables.spacing[0]};
margin-top: ${themeCssVariables.spacing[1]};
width: 100%;
`;
const StyledApiKeyContainer = styled.div`
@@ -101,9 +101,9 @@ const StyledApiKey = styled.span`
font-weight: ${themeCssVariables.font.weight.semiBold};
margin-bottom: ${themeCssVariables.spacing['1.5']};
margin-top: ${themeCssVariables.spacing[1]};
width: 100%;
white-space: nowrap;
width: 100%;
`;
const StyledLabelContainer = styled.div`
@@ -122,9 +122,9 @@ const StyledIconContainer = styled.div`
`;
const StyledIconPointContainer = styled.span`
margin-right: ${themeCssVariables.spacing['0.5']};
display: flex;
align-items: center;
display: flex;
margin-right: ${themeCssVariables.spacing['0.5']};
`;
const StyledFooterContainer = styled.div`
@@ -142,8 +142,8 @@ const StyledButtonContainer = styled.div`
`;
const StyledOptionsHeaderContainer = styled.div`
display: flex;
align-items: center;
display: flex;
justify-content: space-between;
margin-bottom: ${themeCssVariables.spacing['1.5']};
margin-top: ${themeCssVariables.spacing[1]};
@@ -157,8 +157,8 @@ const StyledTextAreaContainer = styled.div`
const StyledHelpText = styled.div`
color: ${themeCssVariables.font.color.light};
font-size: ${themeCssVariables.font.size.xs};
margin-top: ${themeCssVariables.spacing[1]};
margin-bottom: ${themeCssVariables.spacing[2]};
margin-top: ${themeCssVariables.spacing[1]};
`;
export const SettingsDataModelFieldSelectForm = ({
packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
+10 -10
View File
@@ -76,13 +76,13 @@ const StyledRow = styled.div`
`;
const StyledColorSampleContainer = styled.span`
cursor: pointer;
margin-top: ${themeCssVariables.spacing[1]};
margin-bottom: ${themeCssVariables.spacing[1]};
margin-right: 14px;
margin-left: 14px;
display: flex;
align-items: center;
cursor: pointer;
display: flex;
margin-bottom: ${themeCssVariables.spacing[1]};
margin-left: 14px;
margin-right: 14px;
margin-top: ${themeCssVariables.spacing[1]};
`;
const StyledOptionInputContainer = styled.div`
@@ -95,15 +95,15 @@ const StyledOptionInputContainer = styled.div`
`;
const StyledIconGripVerticalContainer = styled.span`
margin-right: 3px;
display: flex;
align-items: center;
display: flex;
margin-right: 3px;
`;
const StyledLightIconButtonContainer = styled.span`
margin-left: ${themeCssVariables.spacing[2]};
display: flex;
align-items: center;
display: flex;
margin-left: ${themeCssVariables.spacing[2]};
`;
export const SettingsDataModelFieldSelectFormOptionRow = ({
packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
+3 -3
View File
@@ -35,14 +35,14 @@ const StyledFieldPreview = styled.div<{ shrink?: boolean }>`
gap: ${themeCssVariables.spacing[2]};
height: fit-content;
line-height: 24px;
margin-top: ${themeCssVariables.spacing[2]};
overflow: hidden;
padding: 0
${({ shrink }) =>
shrink ? themeCssVariables.spacing[1] : themeCssVariables.spacing[2]};
white-space: nowrap;
margin-top: ${themeCssVariables.spacing[2]};
padding-top: ${themeCssVariables.spacing[2]};
padding-bottom: ${themeCssVariables.spacing[2]};
padding-top: ${themeCssVariables.spacing[2]};
white-space: nowrap;
`;
const StyledFieldLabel = styled.div`
packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreview.tsx
+3 -3
View File
@@ -34,14 +34,14 @@ const StyledFieldPreview = styled.div<{ shrink?: boolean }>`
gap: ${themeCssVariables.spacing[2]};
height: fit-content;
line-height: 24px;
margin-top: ${themeCssVariables.spacing[2]};
overflow: hidden;
padding: 0
${({ shrink }) =>
shrink ? themeCssVariables.spacing[1] : themeCssVariables.spacing[2]};
white-space: nowrap;
margin-top: ${themeCssVariables.spacing[2]};
padding-top: ${themeCssVariables.spacing[2]};
padding-bottom: ${themeCssVariables.spacing[2]};
padding-top: ${themeCssVariables.spacing[2]};
white-space: nowrap;
`;
const StyledFieldLabel = styled.div`
packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
+1 -1
View File
@@ -63,9 +63,9 @@ const StyledContainer = styled.div`
`;
const StyledCloseButton = styled.div`
left: ${themeCssVariables.spacing[3]};
position: absolute;
top: ${themeCssVariables.spacing[3]};
left: ${themeCssVariables.spacing[3]};
z-index: 5;
`;
packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx
+1 -1
View File
@@ -17,9 +17,9 @@ const StyledRow = styled.div`
align-items: center;
display: flex;
gap: ${themeCssVariables.spacing[2]};
padding: 0 ${themeCssVariables.spacing[2]};
position: relative;
width: 100%;
padding: 0 ${themeCssVariables.spacing[2]};
`;
const StyledFieldName = styled.div`
packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation.tsx
+1 -1
View File
@@ -14,9 +14,9 @@ const StyledRow = styled.div`
align-items: center;
display: flex;
gap: ${themeCssVariables.spacing[2]};
padding: 0 ${themeCssVariables.spacing[2]};
position: relative;
width: 100%;
padding: 0 ${themeCssVariables.spacing[2]};
`;
const StyledFieldName = styled.div`
packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
+10 -10
View File
@@ -23,14 +23,14 @@ type SettingsDataModelOverviewObjectProps =
const StyledNode = styled.div`
background-color: ${themeCssVariables.background.secondary};
border: 1px solid ${themeCssVariables.border.color.medium};
border-radius: ${themeCssVariables.border.radius.md};
box-shadow: ${themeCssVariables.boxShadow.light};
display: flex;
flex-direction: column;
width: 220px;
padding: ${themeCssVariables.spacing[2]};
gap: ${themeCssVariables.spacing[2]};
border: 1px solid ${themeCssVariables.border.color.medium};
box-shadow: ${themeCssVariables.boxShadow.light};
padding: ${themeCssVariables.spacing[2]};
width: 220px;
`;
const StyledHeader = styled.div`
@@ -50,30 +50,30 @@ const StyledObjectName = styled.div`
`;
const StyledInnerCard = styled.div`
border: 1px solid ${themeCssVariables.border.color.light};
background-color: ${themeCssVariables.background.primary};
border: 1px solid ${themeCssVariables.border.color.light};
border-radius: ${themeCssVariables.border.radius.sm};
padding: ${themeCssVariables.spacing[2]} 0 ${themeCssVariables.spacing[2]} 0;
color: ${themeCssVariables.font.color.tertiary};
display: flex;
flex-flow: column nowrap;
gap: ${themeCssVariables.spacing['0.5']};
color: ${themeCssVariables.font.color.tertiary};
padding: ${themeCssVariables.spacing[2]} 0 ${themeCssVariables.spacing[2]} 0;
`;
const StyledCardRow = styled.div`
align-items: center;
display: flex;
height: 24px;
gap: ${themeCssVariables.spacing[1]};
height: 24px;
`;
const StyledCardRowOther = styled.div`
align-items: center;
cursor: pointer;
display: flex;
gap: ${themeCssVariables.spacing[2]};
height: 24px;
padding: 0 ${themeCssVariables.spacing[2]};
gap: ${themeCssVariables.spacing[2]};
&:hover {
background-color: ${themeCssVariables.background.tertiary};
@@ -89,10 +89,10 @@ const StyledObjectInstanceCount = styled.div`
const StyledObjectLinkContainer = styled.div`
> a {
align-items: center;
color: ${themeCssVariables.font.color.primary};
display: flex;
gap: ${themeCssVariables.spacing[1]};
text-decoration: none;
color: ${themeCssVariables.font.color.primary};
&:hover {
color: ${themeCssVariables.font.color.secondary};
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+8 -8
View File
@@ -40,27 +40,27 @@ export const OBJECT_FIELD_TABLE_ROW_GRID_TEMPLATE_COLUMNS =
'minmax(0, 1fr) 148px 148px 36px';
const StyledNameContainer = styled.div`
display: flex;
align-items: center;
display: flex;
flex: 1;
min-width: 0;
gap: ${themeCssVariables.spacing[1]};
min-width: 0;
`;
const StyledNameLabel = styled.div`
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
`;
const StyledInactiveLabel = styled.span`
color: ${themeCssVariables.font.color.extraLight};
font-size: ${themeCssVariables.font.size.sm};
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
flex: 0 999 auto;
font-size: ${themeCssVariables.font.size.sm};
min-width: 48px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
&::before {
content: '·';
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx
+8 -8
View File
@@ -24,27 +24,27 @@ export type SettingsObjectMetadataItemTableRowProps = {
};
const StyledNameContainer = styled.div`
display: flex;
align-items: center;
display: flex;
flex: 1;
min-width: 0;
gap: ${themeCssVariables.spacing[1]};
min-width: 0;
`;
const StyledNameLabel = styled.div`
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
`;
const StyledInactiveLabel = styled.span`
color: ${themeCssVariables.font.color.extraLight};
font-size: ${themeCssVariables.font.size.sm};
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
flex: 0 999 auto;
font-size: ${themeCssVariables.font.size.sm};
min-width: 48px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
&::before {
content: '·';
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationItemTableRow.tsx
+10 -10
View File
@@ -29,27 +29,27 @@ export const OBJECT_RELATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS =
'minmax(0, 1fr) 148px 148px 36px';
const StyledNameContainer = styled.div`
display: flex;
align-items: center;
display: flex;
flex: 1;
min-width: 0;
gap: ${themeCssVariables.spacing[1]};
min-width: 0;
`;
const StyledNameLabel = styled.div`
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
`;
const StyledInactiveLabel = styled.span`
color: ${themeCssVariables.font.color.extraLight};
font-size: ${themeCssVariables.font.size.sm};
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
flex: 0 999 auto;
font-size: ${themeCssVariables.font.size.sm};
min-width: 48px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
&::before {
content: '·';
@@ -77,11 +77,11 @@ const StyledLinkContainer = styled.div`
> a {
color: ${themeCssVariables.font.color.primary};
overflow: hidden;
text-decoration: underline;
text-decoration-color: ${themeCssVariables.border.color.strong};
text-underline-offset: 2px;
overflow: hidden;
text-overflow: ellipsis;
text-underline-offset: 2px;
white-space: nowrap;
&:hover {
packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
+2 -2
View File
@@ -17,10 +17,10 @@ const StyledCoverImageContainer = styled.div`
border-radius: ${themeCssVariables.border.radius.md};
box-sizing: border-box;
display: flex;
min-height: 153px;
justify-content: center;
position: relative;
margin-bottom: ${themeCssVariables.spacing[8]};
min-height: 153px;
position: relative;
`;
const StyledButtonContainer = styled.div`
packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+2 -2
View File
@@ -48,10 +48,10 @@ const StyledInputContainer = styled.div`
const StyledAdvancedSettingsSectionInputWrapper = styled.div`
display: flex;
flex: 1;
flex-direction: column;
gap: ${themeCssVariables.spacing[4]};
width: 100%;
flex: 1;
`;
const StyledAdvancedSettingsOuterContainer = styled.div`
@@ -86,8 +86,8 @@ const StyledConflictBanner = styled.div`
const StyledBannerContent = styled.div`
align-items: center;
display: flex;
gap: ${themeCssVariables.spacing[2]};
flex: 1;
gap: ${themeCssVariables.spacing[2]};
`;
const StyledBannerText = styled.span`