Switched to pnpm.
Some checks are pending
farmcontrol/farmcontrol-server/pipeline/head Build started...
Some checks are pending
farmcontrol/farmcontrol-server/pipeline/head Build started...
This commit is contained in:
parent
731985000d
commit
bc91c2330f
14
Jenkinsfile
vendored
14
Jenkinsfile
vendored
@ -9,10 +9,10 @@ def buildOnLabel(label, buildCommand) {
|
|||||||
nodejs(nodeJSInstallationName: 'Node23') {
|
nodejs(nodeJSInstallationName: 'Node23') {
|
||||||
if (isUnix()) {
|
if (isUnix()) {
|
||||||
sh 'node -v'
|
sh 'node -v'
|
||||||
sh 'yarn -v'
|
sh 'pnpm -v'
|
||||||
} else {
|
} else {
|
||||||
bat 'node -v'
|
bat 'node -v'
|
||||||
bat 'yarn -v'
|
bat 'pnpm -v'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -20,9 +20,9 @@ def buildOnLabel(label, buildCommand) {
|
|||||||
stage("Install Dependencies (${label})") {
|
stage("Install Dependencies (${label})") {
|
||||||
nodejs(nodeJSInstallationName: 'Node23') {
|
nodejs(nodeJSInstallationName: 'Node23') {
|
||||||
if (isUnix()) {
|
if (isUnix()) {
|
||||||
sh 'yarn install --frozen-lockfile --production=false'
|
sh 'pnpm install --frozen-lockfile --production=false'
|
||||||
} else {
|
} else {
|
||||||
bat 'yarn install --frozen-lockfile --production=false'
|
bat 'pnpm install --frozen-lockfile --production=false'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -46,9 +46,9 @@ def buildOnLabel(label, buildCommand) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
parallel(
|
parallel(
|
||||||
'Windows Build': buildOnLabel('windows', 'yarn build:electron'),
|
'Windows Build': buildOnLabel('windows', 'pnpm build:electron'),
|
||||||
'MacOS Build': buildOnLabel('macos', 'yarn build:electron'),
|
'MacOS Build': buildOnLabel('macos', 'pnpm build:electron'),
|
||||||
'Linux Build': buildOnLabel('ubuntu', 'yarn build:linux')
|
'Linux Build': buildOnLabel('ubuntu', 'pnpm build:linux')
|
||||||
)
|
)
|
||||||
|
|
||||||
echo 'All parallel stages completed successfully!'
|
echo 'All parallel stages completed successfully!'
|
||||||
|
|||||||
@ -9,12 +9,12 @@
|
|||||||
"start": "node build/index.js",
|
"start": "node build/index.js",
|
||||||
"dev": "cross-env NODE_ENV=development nodemon src/index.js",
|
"dev": "cross-env NODE_ENV=development nodemon src/index.js",
|
||||||
"dev:electron": "concurrently \"cross-env NODE_ENV=development vite src/electron --port 5287 --no-open\" \"cross-env NODE_ENV=development electron src/index.js\"",
|
"dev:electron": "concurrently \"cross-env NODE_ENV=development vite src/electron --port 5287 --no-open\" \"cross-env NODE_ENV=development electron src/index.js\"",
|
||||||
"build": "yarn clean && yarn build:server && yarn build:renderer",
|
"build": "pnpm clean && pnpm build:server && pnpm build:renderer",
|
||||||
"build:server": "shx mkdir -p build && shx cp -r src/. build/ && shx cp package.json config.json build/",
|
"build:server": "shx mkdir -p build && shx cp -r src/. build/ && shx cp package.json config.json build/",
|
||||||
"build:renderer": "yarn build:electron-renderer && shx cp src/electron/preload.js build/electron/ && shx rm -rf build/electron/App.jsx build/electron/main.jsx build/electron/App.css build/electron/index.css build/electron/FarmControlLogo.jsx build/electron/vite.config.js build/electron/public build/electron/build",
|
"build:renderer": "pnpm build:electron-renderer && shx cp src/electron/preload.js build/electron/ && shx rm -rf build/electron/App.jsx build/electron/main.jsx build/electron/App.css build/electron/index.css build/electron/FarmControlLogo.jsx build/electron/vite.config.js build/electron/public build/electron/build",
|
||||||
"build:electron-renderer": "vite build src/electron --outDir build/electron",
|
"build:electron-renderer": "vite build src/electron --outDir build/electron",
|
||||||
"build:electron": "yarn build && electron-builder",
|
"build:electron": "pnpm build && electron-builder",
|
||||||
"build:linux": "yarn clean && yarn build:server && shx mkdir -p app_dist/linux && pkg . --targets node18-linux-x64 --output app_dist/linux/farmcontrol-server && fpm -f -s dir -t deb -n farmcontrol-server -p app_dist/linux/ -v $(node -p \"require('./package.json').version\") --after-install packaging/linux/after-install.sh --after-remove packaging/linux/after-remove.sh app_dist/linux/farmcontrol-server=/usr/bin/farmcontrol-server packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service && fpm -f -s dir -t rpm -n farmcontrol-server -p app_dist/linux/ -v $(node -p \"require('./package.json').version\") --after-install packaging/linux/after-install.sh --after-remove packaging/linux/after-remove.sh app_dist/linux/farmcontrol-server=/usr/bin/farmcontrol-server packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service",
|
"build:linux": "pnpm clean && pnpm build:server && shx mkdir -p app_dist/linux && pkg . --targets node18-linux-x64 --output app_dist/linux/farmcontrol-server && fpm -f -s dir -t deb -n farmcontrol-server -p app_dist/linux/ -v $(node -p \"require('./package.json').version\") --after-install packaging/linux/after-install.sh --after-remove packaging/linux/after-remove.sh app_dist/linux/farmcontrol-server=/usr/bin/farmcontrol-server packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service && fpm -f -s dir -t rpm -n farmcontrol-server -p app_dist/linux/ -v $(node -p \"require('./package.json').version\") --after-install packaging/linux/after-install.sh --after-remove packaging/linux/after-remove.sh app_dist/linux/farmcontrol-server=/usr/bin/farmcontrol-server packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service",
|
||||||
"clean": "rimraf build"
|
"clean": "rimraf build"
|
||||||
},
|
},
|
||||||
"author": "Tom Butcher",
|
"author": "Tom Butcher",
|
||||||
|
|||||||
9759
pnpm-lock.yaml
generated
Normal file
9759
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user