Merge branch 'release-2024-fall' into observation/FOUR-19658

ProcessMaker · Oct 21, 2024 · 18d5bed · 18d5bed
2 parents 30167bb + 4ff8e5d
commit 18d5bed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,9 +25,6 @@ jobs:
       - name: set-vfe-branch
         run: |
           export VFE_BRANCH=''
-          if [[ ${{ contains(github.event.pull_request.body, 'ci:next') }} ]]; then
-            export VFE_BRANCH=next
-          fi
           if [[ "${{ steps.install-vfe.outputs.match }}" != "" ]]; then
             export VFE_BRANCH=${{ steps.install-vfe.outputs.group1 }}
           fi

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@fortawesome/fontawesome-free": "^5.6.1",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@panter/vue-i18next": "^0.15.2",
-    "@processmaker/vue-form-elements": "0.60.0",
+    "@processmaker/vue-form-elements": "0.60.1",
     "@processmaker/vue-multiselect": "2.3.0",
     "@storybook/addon-essentials": "^7.6.13",
     "@storybook/addon-interactions": "^7.6.13",
@@ -116,7 +116,7 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.60.0",
+    "@processmaker/vue-form-elements": "0.60.1",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"