Skip to content

Commit 49eb3d5

Browse files
committed
starting to adjust ci
1 parent 5535e57 commit 49eb3d5

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

Diff for: .github/workflows/ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
env:
6969
DISABLE_SOURCE_MAPS: true
7070
BROCCOLI_ENV: production
71-
run: pnpm ember build
71+
run: pnpm vite build --mode=development
7272
- name: Upload build
7373
uses: actions/upload-artifact@v3
7474
with:
@@ -90,7 +90,7 @@ jobs:
9090
env:
9191
DISABLE_SOURCE_MAPS: true
9292
BROCCOLI_ENV: production
93-
run: pnpm ember build
93+
run: pnpm vite build --mode=development
9494
- name: Upload build
9595
uses: actions/upload-artifact@v3
9696
with:
@@ -113,7 +113,7 @@ jobs:
113113
env:
114114
DISABLE_SOURCE_MAPS: true
115115
BROCCOLI_ENV: production
116-
run: pnpm ember build
116+
run: pnpm vite build --mode=development
117117
- name: Upload build
118118
uses: actions/upload-artifact@v3
119119
with:
@@ -137,7 +137,7 @@ jobs:
137137
DISABLE_SOURCE_MAPS: true
138138
BROCCOLI_ENV: production
139139
SHOULD_TRANSPILE: true
140-
run: pnpm ember build
140+
run: pnpm vite build --mode=development
141141

142142
- name: Set BrowserStack Local Identifier
143143
if: startsWith(github.ref, 'refs/tags/v')
@@ -161,7 +161,7 @@ jobs:
161161
- uses: actions/checkout@v3
162162
- uses: ./.github/actions/setup
163163
- name: build
164-
run: pnpm ember build -prod
164+
run: pnpm build
165165
- name: test
166166
# todo: potentially more apps? use matrix?
167167
run: |
@@ -181,7 +181,7 @@ jobs:
181181
env:
182182
DISABLE_SOURCE_MAPS: true
183183
BROCCOLI_ENV: production
184-
run: pnpm ember build -prod
184+
run: pnpm vite build --mode=production
185185
- name: test
186186
run: pnpm test
187187

@@ -197,7 +197,7 @@ jobs:
197197
DISABLE_SOURCE_MAPS: true
198198
BROCCOLI_ENV: production
199199
DEBUG_RENDER_TREE: true
200-
run: pnpm ember build -prod
200+
run: pnpm vite build --mode=production
201201
- name: test
202202
run: pnpm test
203203

@@ -229,7 +229,7 @@ jobs:
229229
DISABLE_SOURCE_MAPS: true
230230
BROCCOLI_ENV: production
231231
SHOULD_TRANSPILE_FOR_NODE: true
232-
run: pnpm ember build -prod
232+
run: pnpm vite build
233233
- name: test
234234
run: pnpm test:node
235235

Diff for: bin/run-tests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function run(queryString) {
4747
queryString = `${queryString}&overridedeprecationversion=${process.env.OVERRIDE_DEPRECATION_VERSION}`;
4848
}
4949

50-
let url = 'http://localhost:' + PORT + '/tests/?' + queryString;
50+
let url = 'http://localhost:' + PORT + '/?' + queryString;
5151
return runInBrowser(url, 3);
5252
}
5353

Diff for: vite.config.mjs

+18-13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global process */
2+
13
import { defineConfig } from 'vite';
24
import { babel } from '@rollup/plugin-babel';
35
import { resolve, dirname } from 'node:path';
@@ -14,19 +16,22 @@ const require = createRequire(import.meta.url);
1416
const projectRoot = dirname(fileURLToPath(import.meta.url));
1517
const { packageName: getPackageName, PackageCache } = require('@embroider/shared-internals');
1618

17-
export default defineConfig({
18-
plugins: [
19-
babel({
20-
babelHelpers: 'bundled',
21-
extensions: ['.js', '.ts'],
22-
configFile: resolve(dirname(fileURLToPath(import.meta.url)), './babel.test.config.mjs'),
23-
}),
24-
resolvePackages(exposedDependencies(), hiddenDependencies()),
25-
viteResolverBug(),
26-
version(),
27-
],
28-
optimizeDeps: { disabled: true },
29-
publicDir: 'tests/public',
19+
export default defineConfig(({ mode }) => {
20+
process.env.EMBER_ENV = mode;
21+
return {
22+
plugins: [
23+
babel({
24+
babelHelpers: 'bundled',
25+
extensions: ['.js', '.ts'],
26+
configFile: resolve(dirname(fileURLToPath(import.meta.url)), './babel.test.config.mjs'),
27+
}),
28+
resolvePackages(exposedDependencies(), hiddenDependencies()),
29+
viteResolverBug(),
30+
version(),
31+
],
32+
optimizeDeps: { disabled: true },
33+
publicDir: 'tests/public',
34+
};
3035
});
3136

3237
function viteResolverBug() {

0 commit comments

Comments
 (0)