Skip to content

Commit ecdea2f

Browse files
committed
integrate npm-package with conan-package from workflow automation
The npm-package.yml file has been deleted, and its functionality is now integrated directly into the conan-package.yml process. This change aims to streamline the workflow by consolidating tasks, reducing redundancy, and ensuring all package-related actions are handled efficiently within a single workflow configuration. Contribute to NP-637
1 parent 681466e commit ecdea2f

File tree

2 files changed

+9
-49
lines changed

2 files changed

+9
-49
lines changed

.github/workflows/conan-package.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
- 'conandata.yml'
1111
- 'CMakeLists.txt'
1212
- '.github/workflows/conan-package.yml'
13-
- '.github/workflows/npm-package.yml'
1413
branches:
1514
- main
1615
- 'CURA-*'
@@ -31,7 +30,6 @@ on:
3130
- 'conandata.yml'
3231
- 'CMakeLists.txt'
3332
- '.github/workflows/conan-package.yml'
34-
- '.github/workflows/npm-package.yml'
3533
branches:
3634
- main
3735
- 'CURA-*'
@@ -42,7 +40,15 @@ on:
4240

4341
jobs:
4442
conan-package:
45-
uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main
43+
uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@NP-637_conan_v2_wasm
4644
with:
4745
platform_wasm: true
4846
secrets: inherit
47+
48+
npm-package:
49+
needs: [ conan-package ]
50+
if: ${{ github.event_name == 'push' }}
51+
uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@NP-637_conan_v2_wasm
52+
with:
53+
version_full: ${{ needs.conan-package.outputs.version_full }}
54+
secrets: inherit

.github/workflows/npm-package.yml

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

0 commit comments

Comments
 (0)