From cd0bcbd1b9cf22985eb8223ceac81b33a980f8ad Mon Sep 17 00:00:00 2001 From: "Etienne Rossignon (Sterfive)" Date: Sat, 7 May 2022 17:15:53 +0200 Subject: [PATCH 1/3] update packages --- Makefile | 2 +- package-lock.json | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 3a9a853..8d6c91c 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ clean: node-pre-gyp clean packet: - npm install mocha@7 + npm install mocha@9 npm install assert npm install should npm install node-pre-gyp diff --git a/package-lock.json b/package-lock.json index cfb48ee..3720567 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1709,20 +1709,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -5163,13 +5149,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", From 3459cd45c5ec27a2bca219bf6b40f10071b2a83f Mon Sep 17 00:00:00 2001 From: "Etienne Rossignon (Sterfive)" Date: Sat, 7 May 2022 17:24:54 +0200 Subject: [PATCH 2/3] wip --- .github/workflows/workflow.yml | 54 +++++++++++++++++++++++++++ .travis.yml => .travis._obsolete.yml | 0 Notes.md | 4 ++ appveyor.yml => appveyor_obsolete.yml | 0 4 files changed, 58 insertions(+) create mode 100644 .github/workflows/workflow.yml rename .travis.yml => .travis._obsolete.yml (100%) create mode 100644 Notes.md rename appveyor.yml => appveyor_obsolete.yml (100%) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 0000000..4788e2f --- /dev/null +++ b/.github/workflows/workflow.yml @@ -0,0 +1,54 @@ +# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: Node.js CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + + build_on_windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - uses: actions/cache@v2 + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-pnpm-store + - run: pip3 install conan + - run: npm install -g pnpm@6 + - run: pnpm recursive install + - run: pnpm run build --if-present + - run: pnpm run pretest + - run: pnpm test + build: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [14.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - run: pip3 install conan + - run: npm install -g pnpm@6 + - uses: actions/cache@v2 + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-pnpm-store + - run: npm install -g pnpm@6 + - run: pnpm recursive install + - run: pnpm run build + - run: pnpm run pretest + - run: pnpm test diff --git a/.travis.yml b/.travis._obsolete.yml similarity index 100% rename from .travis.yml rename to .travis._obsolete.yml diff --git a/Notes.md b/Notes.md new file mode 100644 index 0000000..e4ddc1b --- /dev/null +++ b/Notes.md @@ -0,0 +1,4 @@ +## Conan + +pip3 install conan + diff --git a/appveyor.yml b/appveyor_obsolete.yml similarity index 100% rename from appveyor.yml rename to appveyor_obsolete.yml From cc49ae1054d26e9af8a7fdc6da188aebfbce0311 Mon Sep 17 00:00:00 2001 From: "Etienne Rossignon (Sterfive)" Date: Sat, 7 May 2022 17:38:30 +0200 Subject: [PATCH 3/3] wip --- .github/workflows/workflow.yml | 14 ++++++++++++++ conanfile.txt | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 conanfile.txt diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4788e2f..8aaf638 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -23,7 +23,14 @@ jobs: with: path: ~/.pnpm-store key: ${{ runner.os }}-pnpm-store + - run: pip3 install conan + - run: conan install . + - run: git clone https://github.com/czoido/conan-gyp-generator + - run: cd conan-gyp-generator + - run: conan config install gyp-generator.py -tf generators + - run: cd .. + - run: npm install -g pnpm@6 - run: pnpm recursive install - run: pnpm run build --if-present @@ -41,7 +48,14 @@ jobs: uses: actions/setup-node@v2 with: node-version: ${{ matrix.node-version }} + - run: pip3 install conan + - run: conan install . + - run: git clone https://github.com/czoido/conan-gyp-generator + - run: cd conan-gyp-generator + - run: conan config install gyp-generator.py -tf generators + - run: cd .. + - run: npm install -g pnpm@6 - uses: actions/cache@v2 with: diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..11935e4 --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,6 @@ + [requires] + opencascade/7.6.0 + + [generators] + cmake +