Skip to content

Commit df87f95

Browse files
committed
Revert "Merge branch 'master' into master"
This reverts commit b311674, reversing changes made to 7e765f9.
1 parent 44c2271 commit df87f95

File tree

7 files changed

+25
-153
lines changed

7 files changed

+25
-153
lines changed

.github/workflows/buildFull.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ jobs:
5151
-v $(pwd)/..:/src \
5252
-u $(id -u):$(id -g) \
5353
${{ secrets.DOCKER_IMAGE_NAME }} \
54-
/src/builds/opencascade.cad-viewer.yml
54+
/src/builds/opencascade.full.yml
5555
cd ..
56-
mv opencascade.cad-viewer.* dist
56+
mv opencascade.full.* dist
5757
5858
- uses: actions/upload-artifact@v2
5959
with:
@@ -64,12 +64,12 @@ jobs:
6464
with:
6565
node-version: '15'
6666

67-
# - name: Run tests
68-
# run: |
69-
# cd test
70-
# npm install
71-
# npm run test
72-
# cd ..
67+
- name: Run tests
68+
run: |
69+
cd test
70+
npm install
71+
npm run test
72+
cd ..
7373
7474
- name: Push to Docker Hub
7575
if: ${{ github.event.inputs.release == 'yes' }}
@@ -82,7 +82,7 @@ jobs:
8282
run: |
8383
git config --local user.email "[email protected]"
8484
git config --local user.name "GitHub Action"
85-
npm set //npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}
85+
npm set //registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}
8686
8787
- name: Publish new beta version to NPM
8888
if: ${{ github.event.inputs.release == 'yes' }}

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

builds/opencascade.cad-viewer.yml

Lines changed: 0 additions & 125 deletions
This file was deleted.

package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "@interactiveimpressions/opencascade.js-cad-viewer",
3-
"version": "2.0.0-beta.a6e20db",
2+
"name": "opencascade.js",
3+
"version": "2.0.0-beta.cf920ba",
44
"description": "A port of the OpenCascade CAD library to JavaScript and WebAssembly via Emscripten.",
55
"main": "dist/",
66
"author": "Sebastian Alff <[email protected]>",
77
"license": "LGPL-2.1-only",
8-
"repository": "github:InteractiveImpressions/opencascade.js-cad-viewer",
8+
"repository": "github:donalffons/opencascade.js",
99
"types": "dist/index.d.ts",
1010
"peerDependencies": {
1111
"ws": "^8.2.1"

src/compileBindings.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ def buildOneFile(item):
2222
# "-g3",
2323
# "-gsource-map",
2424
# "--source-map-base=http://localhost:8080",
25-
"-pthread",
25+
# "-pthread",
2626
# "-sPTHREAD_POOL_SIZE='navigator.hardwareConcurrency'",
27-
"-flto",
2827
*list(map(lambda x: "-I" + x, ocIncludePaths + additionalIncludePaths)),
2928
"-c", item,
3029
]

src/compileSources.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ def buildObjectFiles(file):
6363
# "-g3",
6464
# "-gsource-map",
6565
# "--source-map-base=http://localhost:8080",
66-
"-sDISABLE_EXCEPTION_CATCHING=0",
67-
"-pthread",
66+
# "-fPIC",
67+
# "-pthread",
6868
# "-sPTHREAD_POOL_SIZE='navigator.hardwareConcurrency'",
69-
"-flto",
7069
*list(map(lambda x: "-I" + x, includePaths)),
7170
"-c",
7271
file,

0 commit comments

Comments
 (0)