Skip to content

Commit 8395e16

Browse files
slimbuckgreggman
authored andcommitted
latest
1 parent dafb34a commit 8395e16

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
if: startsWith(matrix.config.os, 'windows')
8181
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
8282
with:
83-
s dk-version: 26100
83+
sdk-version: 26100
8484

8585
- name: Install dependencies on ubuntu
8686
if: startsWith(matrix.config.name, 'Ubuntu')

build/build.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const kDepotToolsPath = path.join(kCwd, 'third_party', 'depot_tools');
1010
const kDawnPath = `${kCwd}/third_party/dawn`;
1111
const kOutDir = 'out/cmake-release';
1212
const kBuildPath = `${kDawnPath}/${kOutDir}`
13+
const kConfig = process.env.CMAKE_BUILD_TYPE ?? 'Release';
1314

1415
const isMac = process.platform === 'darwin';
1516
const isWin = process.platform === 'win32';
@@ -31,7 +32,7 @@ async function compile() {
3132
await processThenRestoreCWD(async () => {
3233
process.chdir(kBuildPath);
3334
if (isWin) {
34-
await execute('cmake', ['--build', '.', '--target', 'dawn_node'])
35+
await execute('cmake', ['--build', '.', '--target', 'dawn_node', '--config', kConfig]);
3536
} else {
3637
await execute('ninja', ['dawn.node']);
3738
}
@@ -56,15 +57,15 @@ async function createProject() {
5657
...addElemIf(!isWin, '-GNinja'),
5758
'-DDAWN_BUILD_NODE_BINDINGS=1',
5859
'-DDAWN_USE_X11=OFF',
59-
`-DCMAKE_BUILD_TYPE=${process.env.CMAKE_BUILD_TYPE ?? 'Release'}`,
60+
`-DCMAKE_BUILD_TYPE=${kConfig}`,
6061
...addElemIf(isWin, '-DCMAKE_SYSTEM_VERSION=10.0.26100.0'),
6162
...addElemIf(isMac, '-DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'),
6263
]);
6364
});
6465
}
6566

6667
async function copyResult(filepath, target) {
67-
const srcFilename = path.join(...[filepath, ...addElemIf(isWin, 'Debug'), 'dawn.node']);
68+
const srcFilename = path.join(...[filepath, ...addElemIf(isWin, 'Release'), 'dawn.node']);
6869
const dstFilename = path.join('dist', `${target}.dawn.node`);
6970
fs.mkdirSync(path.dirname(dstFilename), {recursive: true});
7071
fs.copyFileSync(srcFilename, dstFilename);

0 commit comments

Comments
 (0)