Skip to content

Commit

Permalink
integrate npm-package with conan-package from workflow automation
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jellespijker committed Dec 9, 2024
1 parent 681466e commit ecdea2f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 49 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
- 'conandata.yml'
- 'CMakeLists.txt'
- '.github/workflows/conan-package.yml'
- '.github/workflows/npm-package.yml'
branches:
- main
- 'CURA-*'
Expand All @@ -31,7 +30,6 @@ on:
- 'conandata.yml'
- 'CMakeLists.txt'
- '.github/workflows/conan-package.yml'
- '.github/workflows/npm-package.yml'
branches:
- main
- 'CURA-*'
Expand All @@ -42,7 +40,15 @@ on:

jobs:
conan-package:
uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main
uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@NP-637_conan_v2_wasm
with:
platform_wasm: true
secrets: inherit

npm-package:
needs: [ conan-package ]
if: ${{ github.event_name == 'push' }}
uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@NP-637_conan_v2_wasm
with:
version_full: ${{ needs.conan-package.outputs.version_full }}
secrets: inherit
46 changes: 0 additions & 46 deletions .github/workflows/npm-package.yml

This file was deleted.

0 comments on commit ecdea2f

Please sign in to comment.