Merge branch 'main' of https://github.com/tfso/action-helpers

tfso · Nov 5, 2024 · 951b215 · 951b215
2 parents eba97f0 + 4a05040
commit 951b215
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/npm-build/action.yml b/npm-build/action.yml
@@ -24,9 +24,9 @@ inputs:
     description: Set a custom tag, useful when generating tag based on f.ex FROM image in a docker image. Setting this tag will invalidate any other settings set!
     required: false
   NODE_VERSION: 
-    description: node version, defaults to 14
+    description: node version, defaults to 18
     required: false
-    default: '14'
+    default: '18'
   PRUNE_PRODUCTION:
     description: prune for production
     required: false
@@ -140,6 +140,14 @@ runs:
       run: |
         npm version ${{ steps.semver.outputs.new_tag || steps.custom.outputs.new_tag }} --no-git-tag-version --allow-same-version --ignore-scripts
     
+    - shell: bash
+      name: version workspaces
+      run: |
+        workspaces=$(npm pkg get workspaces)
+        if [[ $workspaces != "{}" ]]; then
+          npm pkg set version=$(npm pkg get version) --workspaces --json        
+        fi
+
     - shell: bash
       name: install
       run: |

diff --git a/yarn-build/action.yml b/yarn-build/action.yml
@@ -24,9 +24,9 @@ inputs:
     description: Set a custom tag, useful when generating tag based on f.ex FROM image in a docker image. Setting this tag will invalidate any other settings set!
     required: false
   NODE_VERSION: 
-    description: node version, defaults to 14
+    description: node version, defaults to 18
     required: false
-    default: '14'
+    default: '18'
   PRUNE_PRODUCTION:
     description: prune for production
     required: false
@@ -135,6 +135,14 @@ runs:
       run: |
         yarn version --new-version ${{ steps.semver.outputs.new_tag || steps.custom.outputs.new_tag }} --no-git-tag-version --no-commit-hooks
 
+    - shell: bash
+      name: version workspaces
+      run: |
+        workspaces=$(npm pkg get workspaces)
+        if [[ $workspaces != "{}" ]]; then
+          npm pkg set version=$(npm pkg get version) --workspaces --json        
+        fi
+
     - shell: bash
       name: install
       run: |