mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Another attempt to rectify the OSX builds.
This commit is contained in:
parent
95466b9d6c
commit
5edeee8017
@ -25,10 +25,6 @@ _cleanup() {
|
|||||||
_build_runtime() {
|
_build_runtime() {
|
||||||
echo "Assembling the runtime environment..."
|
echo "Assembling the runtime environment..."
|
||||||
|
|
||||||
echo "Update yarn version..."
|
|
||||||
yarn set version berry
|
|
||||||
yarn set version 3
|
|
||||||
|
|
||||||
test -d "${BUILD_ROOT}" || mkdir "${BUILD_ROOT}"
|
test -d "${BUILD_ROOT}" || mkdir "${BUILD_ROOT}"
|
||||||
|
|
||||||
# Get a fresh copy of nwjs.
|
# Get a fresh copy of nwjs.
|
||||||
@ -78,7 +74,13 @@ _build_runtime() {
|
|||||||
cp "${SOURCE_DIR}/runtime/package.json" "${BUNDLE_DIR}/Contents/Resources/app.nw/"
|
cp "${SOURCE_DIR}/runtime/package.json" "${BUNDLE_DIR}/Contents/Resources/app.nw/"
|
||||||
|
|
||||||
# Install the runtime node_modules, then replace the package.json
|
# Install the runtime node_modules, then replace the package.json
|
||||||
yarn --cwd "${BUNDLE_DIR}/Contents/Resources/app.nw/" install --production=true
|
pushd "${BUNDLE_DIR}/Contents/Resources/app.nw/" > /dev/null || exit
|
||||||
|
yarn set version berry
|
||||||
|
yarn set version 3
|
||||||
|
yarn plugin import workspace-tools
|
||||||
|
yarn workspaces focus --production
|
||||||
|
|
||||||
|
popd > /dev/null || exit
|
||||||
}
|
}
|
||||||
|
|
||||||
_create_python_env() {
|
_create_python_env() {
|
||||||
@ -293,6 +295,8 @@ _complete_bundle() {
|
|||||||
|
|
||||||
# Build node modules
|
# Build node modules
|
||||||
pushd "${SOURCE_DIR}/web" > /dev/null || exit
|
pushd "${SOURCE_DIR}/web" > /dev/null || exit
|
||||||
|
yarn set version berry
|
||||||
|
yarn set version 3
|
||||||
yarn install
|
yarn install
|
||||||
yarn run bundle
|
yarn run bundle
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user