Skip to content

Commit a4b2d21

Browse files
committed
chore: fix e2e-ci definition in nx.json
1 parent b8baeb8 commit a4b2d21

File tree

2 files changed

+35
-85
lines changed

2 files changed

+35
-85
lines changed

.nx/workflows/agents.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ launch-templates:
4545
sudo apt-get update -y
4646
sudo apt-get -yqq install zip unzip
4747
48-
# TODO: Remove this once the PR to set it on agents by default is merged
49-
- name: Set SHELL environment variable
50-
script: |
51-
# We need $SHELL to be set for the bun installation to correctly link `bunx`
52-
echo "SHELL=/usr/bin/bash" >> $NX_CLOUD_ENV
53-
5448
- name: Install bun
5549
script: |
5650
curl -fsSL https://bun.sh/install | bash

nx.json

Lines changed: 35 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
"targetDefaults": {
4343
"test": {
4444
"options": {
45-
"passWithNoTests": true
45+
"passWithNoTests": true,
46+
"detectOpenHandles": true,
47+
"forceExit": true
4648
},
4749
"configurations": {
4850
"ci": {
@@ -52,6 +54,7 @@
5254
}
5355
},
5456
"e2e": {
57+
"inputs": ["e2eInputs", "^production"],
5558
"options": {
5659
"passWithNoTests": true,
5760
"runInBand": true
@@ -65,17 +68,12 @@
6568
}
6669
},
6770
"e2e-ci": {
68-
"options": {
69-
"passWithNoTests": true,
70-
"runInBand": true
71-
},
72-
"dependsOn": ["nxrocks:populate-local-registry"],
73-
"configurations": {
74-
"ci": {
75-
"ci": true,
76-
"coverage": true
77-
}
78-
}
71+
"inputs": ["e2eInputs", "^production"]
72+
},
73+
"e2e-ci--**/**": {
74+
"inputs": ["e2eInputs", "^production"],
75+
"parallelism": false,
76+
"dependsOn": ["@nx/nx-source:populate-local-registry-storage"]
7977
},
8078
"nx-release-publish": {
8179
"options": {
@@ -147,72 +145,6 @@
147145
"packages/nx-quarkus/**/*",
148146
"packages/nx-spring-boot/**/*"
149147
]
150-
},
151-
{
152-
"plugin": "@nxrocks/nx-ktor",
153-
"options": {
154-
"buildTargetName": "build",
155-
"installTargetName": "install",
156-
"testTargetName": "test",
157-
"cleanTargetName": "clean",
158-
"formatTargetName": "format",
159-
"applyFormatTargetName": "apply-format",
160-
"checkFormatTargetName": "check-format",
161-
"runTargetName": "run",
162-
"serveTargetName": "serve",
163-
"buildImageTargetName": "build-image",
164-
"publishImageTargetName": "publish-image",
165-
"publishImageLocallyTargetName": "publish-image-locally",
166-
"runDockerTargetName": "run-docker"
167-
}
168-
},
169-
{
170-
"plugin": "@nxrocks/nx-flutter",
171-
"options": {
172-
"analyzeTargetName": "analyze",
173-
"cleanTargetName": "clean",
174-
"formatTargetName": "format",
175-
"testTargetName": "test",
176-
"assembleTargetName": "assemble",
177-
"attachTargetName": "attach",
178-
"driveTargetName": "drive",
179-
"genL10nTargetName": "gen-l10n",
180-
"installTargetName": "install",
181-
"runTargetName": "run",
182-
"buildAarTargetName": "build-aar",
183-
"buildApkTargetName": "build-apk",
184-
"buildAppbundleTargetName": "build-appbundle",
185-
"buildBundleTargetName": "build-bundle",
186-
"buildIosTargetName": "build-ios",
187-
"buildIosFrameworkTargetName": "build-ios-framework",
188-
"buildIpaTargetName": "build-ipa",
189-
"pubGetTargetName": "pub-get",
190-
"pubUpgradeTargetName": "pub-upgrade",
191-
"pubDowngradeTargetName": "pub-downgrade",
192-
"pubOutdatedTargetName": "pub-outdated",
193-
"pubAddTargetName": "pub-add",
194-
"pubRemoveTargetName": "pub-remove",
195-
"pubRunTargetName": "pub-run",
196-
"pubPublishTargetName": "pub-publish",
197-
"pubDepsTargetName": "pub-deps",
198-
"pubVersionTargetName": "pub-version"
199-
}
200-
},
201-
{
202-
"plugin": "@nxrocks/nx-spring-boot",
203-
"options": {
204-
"buildTargetName": "build",
205-
"installTargetName": "install",
206-
"testTargetName": "test",
207-
"cleanTargetName": "clean",
208-
"formatTargetName": "format",
209-
"applyFormatTargetName": "apply-format",
210-
"checkFormatTargetName": "check-format",
211-
"runTargetName": "run",
212-
"serveTargetName": "serve",
213-
"buildImageTargetName": "build-image",
214-
"buildInfoTargetName": "build-info"
215-
}
216148
}
217149
],
218150
"namedInputs": {
@@ -227,7 +159,31 @@
227159
"!{projectRoot}/src/test-setup.[jt]s",
228160
"!{projectRoot}/test-setup.[jt]s"
229161
],
230-
"sharedGlobals": ["{workspaceRoot}/.nx/workflows/**/**"]
162+
"sharedGlobals": [
163+
"{workspaceRoot}/.nx/workflows/agents.yaml",
164+
"{workspaceRoot}/.github/workflows/ci.yml"
165+
],
166+
"e2eInputs": [
167+
"default",
168+
"{workspaceRoot}/jest.preset.js",
169+
"{workspaceRoot}/.verdaccio/config.yml",
170+
"{workspaceRoot}/scripts/local-registry/**/*",
171+
{
172+
"env": "SELECTED_CLI"
173+
},
174+
{
175+
"env": "SELECTED_PM"
176+
},
177+
{
178+
"env": "NX_E2E_CI_CACHE_KEY"
179+
},
180+
{
181+
"env": "CI"
182+
},
183+
{
184+
"env": "NX_E2E_RUN_E2E"
185+
}
186+
]
231187
},
232188
"defaultBase": "develop",
233189
"cli": {

0 commit comments

Comments
 (0)