Skip to content

Commit

Permalink
Fix script paths and restore Conan caches
Browse files Browse the repository at this point in the history
NP-76
  • Loading branch information
saumyaj3 committed Aug 12, 2024
1 parent 9d0db4b commit 22043a8
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 22 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/npm-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ jobs:
conan config install https://github.com/Ultimaker/conan-config.git
conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}"
# - name: Cache Conan packages
# uses: actions/cache@v3
# with:
# path: /home/runner/.conan/data
# key: ${{ runner.os }}-conan-data-${{ github.run_id }}
# restore-keys: |
# ${{ runner.os }}-conan-data-
#
# - name: Cache Conan downloads
# uses: actions/cache@v3
# with:
# path: /home/runner/.conan/downloads
# key: ${{ runner.os }}-conan-downloads-${{ github.run_id }}
# restore-keys: |
# ${{ runner.os }}-conan-downloads-
- name: Cache Conan packages
uses: actions/cache@v3
with:
path: /home/runner/.conan/data
key: ${{ runner.os }}-conan-data-${{ github.run_id }}
restore-keys: |
${{ runner.os }}-conan-data-
- name: Cache Conan downloads
uses: actions/cache@v3
with:
path: /home/runner/.conan/downloads
key: ${{ runner.os }}-conan-downloads-${{ github.run_id }}
restore-keys: |
${{ runner.os }}-conan-downloads-
# - name: Build C++
# run: |
Expand Down
4 changes: 2 additions & 2 deletions DulcificumJS/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions DulcificumJS/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"name": "@ultimaker/dulcificumjs",
"version": "0.1.0-alpha.2",
"version": "0.1.0-alpha.1",
"description": "DulcificumJS is a TS component to run Dulcificum in a browser",
"main": "dist/index.js",
"scripts": {
"install_dulcificum": "conan install dulcificum/latest@ultimaker/testing -s build_type=Release --build=missing --update --build=missing -c tools.build:skip_test=True -s arch=wasm -s os=Emscripten -o with_python_bindings=False -pr:h cura_wasm.jinja",
"install_dulcificum": "conan install dulcificum/latest@ultimaker/np-76 -s build_type=Release --build=missing --update --build=missing -c tools.build:skip_test=True -s arch=wasm -s os=Emscripten -o with_python_bindings=False -pr:h cura_wasm.jinja",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint:fix": "npm run lint -- --fix",
"build": "tsc",
"copy:js": "mkdir -p dist/Dulcificum && cp ../build/Release/DulcificumJS/cpp/dulcificum_js.* dist/Dulcificum/",
"prepublish": "npm run copy:js && npm run build"
"lint:tsc": "tsc",
"build": "tsc -p tsconfig.json",
"copy:js": "mkdir -p dist/Dulcificum && cp src/Dulcificum/dulcificum_js.* dist/Dulcificum/",
"prepublish": "npm run build && npm run copy:js"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit 22043a8

Please sign in to comment.