Skip to content

Commit

Permalink
CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kjvalencik committed Feb 13, 2022
1 parent 8b03202 commit ef1c88c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ jobs:
with:
toolchain: ${{ matrix.rust-toolchain }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Use npm v8
run: npm install -g npm@8
- name: install build-essential
run: sudo apt-get install -y build-essential
- name: npm install workspace
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Use npm v8
run: npm install -g npm@8
- name: npm install workspace
run: npm install
- name: run tests
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,22 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Use npm v6
if: ${{ matrix.node-version == '16.x' }}
run: npm install -g npm@6
- name: Install libclang
uses: KyleMayes/install-llvm-action@01144dc97b1e2693196c3056414a44f15180648b
with:
version: "10"
directory: ${{ runner.temp }}/llvm
- run: npm config set msvs_version 2019
- name: Use npm v8
# Windows bug in npm 8.4
# https://github.com/npm/cli/issues/4341
run: npm -g i npm@~8.3
- name: Update header files
run: npm i -g node-gyp@latest && node-gyp install
- name: Configure MSVS version
run: npm config set msvs_version 2022
- name: npm install workspace
run: npm install
- name: run tests
run: npm test
env:
LIBCLANG_PATH: ${{ runner.temp }}/llvm/bin
- name: run tests
run: npm test
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.git/
cli/lib/
test/cli/lib/
node_modules/
create-neon/dist/
target/
artifacts.json
2 changes: 2 additions & 0 deletions crates/neon-build/src/napi/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ fn test_absolute_output_file_defaults() {
}

#[test]
#[cfg_attr(windows, ignore)]
fn test_absolute_output_file_absolute_file() {
let expected = PathBuf::from("/tmp/hello.node");
let actual = Setup::options()
Expand All @@ -145,6 +146,7 @@ fn test_absolute_output_file_absolute_file() {
}

#[test]
#[cfg_attr(windows, ignore)]
fn test_absolute_output_file_absolute_dir() {
let expected = PathBuf::from("/tmp/index.node");
let actual = Setup::options().output_dir("/tmp").absolute_output_file();
Expand Down
1 change: 1 addition & 0 deletions crates/neon-sys/native/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
'Debug': {
'msvs_settings': {
'VCCLCompilerTool': {
'WholeProgramOptimization': 'false',
'RuntimeLibrary': '0',
'UndefinePreprocessorDefinitions': ['DEBUG', '_DEBUG'],
'PreprocessorDefinitions': ['NDEBUG']
Expand Down

0 comments on commit ef1c88c

Please sign in to comment.