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/auth/sign-in-up/components/EmailVerificationSent.tsx
+7 -7
View File
@@ -21,17 +21,17 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AnimatedEaseIn } from 'twenty-ui/utilities';
const StyledContainer = styled.div`
align-items: center;
display: flex;
flex-direction: column;
align-items: center;
gap: ${themeCssVariables.spacing[8]};
width: 100%;
`;
const StyledTextContainer = styled.div`
align-items: center;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
`;
@@ -40,12 +40,12 @@ const StyledEmail = styled.span`
`;
const StyledButtonsContainer = styled.div`
align-items: center;
display: flex;
flex-direction: column;
align-items: center;
gap: ${themeCssVariables.spacing[3]};
width: 100%;
max-width: 240px;
width: 100%;
`;
const StyledBottomLinks = styled.div`
@@ -59,20 +59,20 @@ const StyledBottomLinks = styled.div`
const StyledLinkButton = styled.button`
background: none;
border: none;
color: ${themeCssVariables.font.color.tertiary};
cursor: pointer;
font-family: ${themeCssVariables.font.family};
font-size: ${themeCssVariables.font.size.xs};
font-weight: ${themeCssVariables.font.weight.regular};
line-height: 140%;
color: ${themeCssVariables.font.color.tertiary};
cursor: pointer;
&:hover {
color: ${themeCssVariables.font.color.secondary};
}
&:disabled {
opacity: 0.5;
cursor: not-allowed;
opacity: 0.5;
}
`;
packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
+12 -12
View File
@@ -61,16 +61,16 @@ const StyledWorkspaceContainer = styled.div`
`;
const StyledWorkspaceItem = styled.div`
align-items: center;
cursor: pointer;
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
height: ${themeCssVariables.spacing[15]};
padding: 0;
justify-content: space-between;
overflow: hidden;
cursor: pointer;
justify-content: space-between;
padding: 0;
width: 100%;
&:hover {
background-color: ${themeCssVariables.background.transparent.light};
@@ -85,8 +85,8 @@ const StyledWorkspaceContent = styled.div`
align-items: center;
display: flex;
gap: ${themeCssVariables.spacing[4]};
width: 100%;
padding: 0 ${themeCssVariables.spacing[4]};
width: 100%;
`;
const StyledWorkspaceTextContainer = styled.div`
@@ -96,13 +96,13 @@ const StyledWorkspaceTextContainer = styled.div`
`;
const StyledWorkspaceLogo = styled.div`
border-radius: ${themeCssVariables.border.radius.sm};
height: ${themeCssVariables.spacing[6]};
width: ${themeCssVariables.spacing[6]};
background-color: ${themeCssVariables.background.transparent.light};
display: flex;
justify-content: center;
align-items: center;
background-color: ${themeCssVariables.background.transparent.light};
border-radius: ${themeCssVariables.border.radius.sm};
display: flex;
height: ${themeCssVariables.spacing[6]};
justify-content: center;
width: ${themeCssVariables.spacing[6]};
`;
const StyledWorkspaceName = styled.div`
packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
+4 -4
View File
@@ -25,12 +25,12 @@ const StyledMainContentContainer = styled.div`
const StyledTextContainer = styled.div`
align-items: center;
margin-bottom: ${themeCssVariables.spacing[4]};
color: ${themeCssVariables.font.color.tertiary};
font-size: ${themeCssVariables.font.size.sm};
margin-bottom: ${themeCssVariables.spacing[4]};
max-width: 280px;
text-align: center;
font-size: ${themeCssVariables.font.size.sm};
& > a {
color: ${themeCssVariables.font.color.tertiary};
@@ -50,14 +50,14 @@ const StyledForm = styled.div`
`;
const StyledCopySetupKeyLink = styled.button`
align-items: center;
background: none;
border: none;
color: ${themeCssVariables.font.color.secondary};
cursor: pointer;
display: flex;
align-items: center;
gap: ${themeCssVariables.spacing[1]};
font-size: ${themeCssVariables.font.size.sm};
gap: ${themeCssVariables.spacing[1]};
margin-top: ${themeCssVariables.spacing[2]};
padding: 0;
text-decoration: underline;
packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
+24 -24
View File
@@ -39,27 +39,30 @@ const StyledForm = styled.form`
`;
const StyledSlot = styled.div<{ isActive: boolean }>`
position: relative;
width: 2.5rem;
height: 3.5rem;
font-size: 2rem;
display: flex;
align-items: center;
justify-content: center;
transition: all 0.3s;
border-top: 1px solid ${themeCssVariables.border.color.medium};
border-bottom: 1px solid ${themeCssVariables.border.color.medium};
border-right: 1px solid ${themeCssVariables.border.color.medium};
border-top: 1px solid ${themeCssVariables.border.color.medium};
display: flex;
font-size: 2rem;
height: 3.5rem;
justify-content: center;
outline-color: ${({ isActive }) =>
isActive
? themeCssVariables.border.color.strong
: themeCssVariables.border.color.medium};
outline-style: ${({ isActive }) => (isActive ? 'solid' : 'none')};
outline-width: ${({ isActive }) => (isActive ? '1px' : '0')};
&:first-of-type {
border-bottom-left-radius: 0.375rem;
border-left: 1px solid ${themeCssVariables.border.color.medium};
border-top-left-radius: 0.375rem;
border-bottom-left-radius: 0.375rem;
}
&:last-of-type {
border-top-right-radius: 0.375rem;
border-bottom-right-radius: 0.375rem;
border-top-right-radius: 0.375rem;
}
.group:hover &,
@@ -67,12 +70,9 @@ const StyledSlot = styled.div<{ isActive: boolean }>`
border-color: ${themeCssVariables.border.color.medium};
}
outline-width: ${({ isActive }) => (isActive ? '1px' : '0')};
outline-style: ${({ isActive }) => (isActive ? 'solid' : 'none')};
outline-color: ${({ isActive }) =>
isActive
? themeCssVariables.border.color.strong
: themeCssVariables.border.color.medium};
position: relative;
transition: all 0.3s;
width: 2.5rem;
`;
const StyledPlaceholderChar = styled.div`
@@ -113,9 +113,9 @@ const StyledCaretContainer = styled.div`
`;
const StyledCaret = styled.div`
width: 1px;
height: 2rem;
background-color: ${themeCssVariables.font.color.light};
height: 2rem;
width: 1px;
`;
const FakeCaret = () => {
@@ -127,10 +127,10 @@ const FakeCaret = () => {
};
const StyledDashContainer = styled.div`
display: flex;
width: 2.5rem;
justify-content: center;
align-items: center;
display: flex;
justify-content: center;
width: 2.5rem;
`;
const StyledDash = styled.div`
@@ -149,8 +149,8 @@ const FakeDash = () => {
};
const StyledOTPContainer = styled.div`
display: flex;
align-items: center;
display: flex;
&:has(:disabled) {
opacity: 0.3;
@@ -162,12 +162,12 @@ const StyledSlotGroup = styled.div`
`;
const StyledTextContainer = styled.div`
align-items: center;
margin-bottom: ${themeCssVariables.spacing[4]};
color: ${themeCssVariables.font.color.tertiary};
font-size: ${themeCssVariables.font.size.sm};
margin-bottom: ${themeCssVariables.spacing[4]};
max-width: 280px;
text-align: center;
font-size: ${themeCssVariables.font.size.sm};
`;
const StyledActionBackLinkContainer = styled.div`