mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 21:49:25 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
ce4cd32646
2
.github/workflows/build-pro-image.yml
vendored
2
.github/workflows/build-pro-image.yml
vendored
@ -138,7 +138,7 @@ jobs:
|
|||||||
trimmed_variable=$(echo "$subdirectories" | xargs)
|
trimmed_variable=$(echo "$subdirectories" | xargs)
|
||||||
packageNames="@nocobase/${trimmed_variable// / @nocobase/}"
|
packageNames="@nocobase/${trimmed_variable// / @nocobase/}"
|
||||||
pluginNames="${trimmed_variable//plugin-/}"
|
pluginNames="${trimmed_variable//plugin-/}"
|
||||||
BEFORE_PACK_NOCOBASE="yarn add @nocobase/plugin-notifications @nocobase/plugin-disable-pm-add $packageNames -W"
|
BEFORE_PACK_NOCOBASE="yarn add @nocobase/plugin-notifications @nocobase/plugin-disable-pm-add $packageNames -W --production"
|
||||||
APPEND_PRESET_LOCAL_PLUGINS="notifications,disable-pm-add,${pluginNames// /,}"
|
APPEND_PRESET_LOCAL_PLUGINS="notifications,disable-pm-add,${pluginNames// /,}"
|
||||||
echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
|
echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
|
||||||
echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
|
echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
|
||||||
|
2
.github/workflows/manual-build-pro-image.yml
vendored
2
.github/workflows/manual-build-pro-image.yml
vendored
@ -124,7 +124,7 @@ jobs:
|
|||||||
trimmed_variable=$(echo "$subdirectories" | xargs)
|
trimmed_variable=$(echo "$subdirectories" | xargs)
|
||||||
packageNames="@nocobase/${trimmed_variable// / @nocobase/}"
|
packageNames="@nocobase/${trimmed_variable// / @nocobase/}"
|
||||||
pluginNames="${trimmed_variable//plugin-/}"
|
pluginNames="${trimmed_variable//plugin-/}"
|
||||||
BEFORE_PACK_NOCOBASE="yarn add @nocobase/plugin-notifications @nocobase/plugin-disable-pm-add $packageNames -W"
|
BEFORE_PACK_NOCOBASE="yarn add @nocobase/plugin-notifications @nocobase/plugin-disable-pm-add $packageNames -W --production"
|
||||||
APPEND_PRESET_LOCAL_PLUGINS="notifications,disable-pm-add,${pluginNames// /,}"
|
APPEND_PRESET_LOCAL_PLUGINS="notifications,disable-pm-add,${pluginNames// /,}"
|
||||||
echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
|
echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
|
||||||
echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
|
echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
|
||||||
|
@ -114,7 +114,7 @@ jobs:
|
|||||||
trimmed_variable=$(echo "$subdirectories" | xargs)
|
trimmed_variable=$(echo "$subdirectories" | xargs)
|
||||||
packageNames="@nocobase/${trimmed_variable// / @nocobase/}"
|
packageNames="@nocobase/${trimmed_variable// / @nocobase/}"
|
||||||
pluginNames="${trimmed_variable//plugin-/}"
|
pluginNames="${trimmed_variable//plugin-/}"
|
||||||
BEFORE_PACK_NOCOBASE="yarn add $packageNames -W"
|
BEFORE_PACK_NOCOBASE="yarn add $packageNames -W --production"
|
||||||
APPEND_PRESET_LOCAL_PLUGINS="${pluginNames// /,}"
|
APPEND_PRESET_LOCAL_PLUGINS="${pluginNames// /,}"
|
||||||
echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
|
echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT
|
||||||
echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
|
echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT
|
||||||
|
Loading…
x
Reference in New Issue
Block a user