This commit is contained in:
parent
0fc1fc58e6
commit
e1be2703e8
|
@ -1,8 +1,12 @@
|
|||
#!/usr/bin/env groovy
|
||||
|
||||
def PROTECTED_BRANCH
|
||||
def RUN_BUILD
|
||||
|
||||
def BRANCH_ENV = [
|
||||
test: 'test',
|
||||
master: 'production'
|
||||
master: 'production',
|
||||
vue: 'test'
|
||||
]
|
||||
def remote = [:]
|
||||
|
||||
|
@ -10,6 +14,14 @@ node {
|
|||
stage('Setup') {
|
||||
env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
|
||||
|
||||
PROTECTED_BRANCH = [
|
||||
'dev',
|
||||
'test',
|
||||
'master'
|
||||
].contains(env.BRANCH_NAME)
|
||||
|
||||
RUN_BUILD = PROTECTED_BRANCH
|
||||
|
||||
echo "NODE_NAME: ${env.NODE_NAME}"
|
||||
echo "WORKSPACE: ${env.WORKSPACE}"
|
||||
}
|
||||
|
@ -22,10 +34,7 @@ pipeline {
|
|||
stages {
|
||||
stage('Debuild') {
|
||||
when {
|
||||
anyOf {
|
||||
branch 'master'
|
||||
branch 'test'
|
||||
}
|
||||
expression { PROTECTED_BRANCH }
|
||||
}
|
||||
agent {
|
||||
docker {
|
||||
|
@ -55,10 +64,7 @@ pipeline {
|
|||
}
|
||||
stage('Deploy') {
|
||||
when {
|
||||
anyOf {
|
||||
branch 'master'
|
||||
branch 'test'
|
||||
}
|
||||
expression { PROTECTED_BRANCH }
|
||||
}
|
||||
environment {
|
||||
CREDS = credentials('docker-registry')
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
hedera-web (22.48.2) stable; urgency=low
|
||||
hedera-web (24.0.0) stable; urgency=low
|
||||
|
||||
* Initial Release.
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ rest usr/share/hedera-web
|
|||
utils usr/share/hedera-web
|
||||
index.php usr/share/hedera-web
|
||||
package.json usr/share/hedera-web
|
||||
build usr/share/hedera-web
|
||||
dist/spa usr/share/hedera-web
|
||||
README.md usr/share/hedera-web
|
||||
webpack.config.json usr/share/hedera-web
|
||||
build-deps/node_modules usr/share/hedera-web
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
clean:
|
||||
npm run clean
|
||||
dh_clean $@
|
||||
|
||||
|
||||
build:
|
||||
npm install --no-audit --prefer-offline
|
||||
npm --omit=dev run build
|
||||
npm install --omit=dev --no-audit --prefer-offline
|
||||
npx quasar build
|
||||
|
||||
mkdir -p build-deps
|
||||
cp package.json package-lock.json build-deps
|
||||
|
|
|
@ -5127,9 +5127,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001431",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
|
||||
"integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==",
|
||||
"version": "1.0.30001684",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
|
||||
"integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
@ -5139,6 +5139,10 @@
|
|||
{
|
||||
"type": "tidelift",
|
||||
"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
|
||||
},
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/ai"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -19566,9 +19570,9 @@
|
|||
}
|
||||
},
|
||||
"caniuse-lite": {
|
||||
"version": "1.0.30001431",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
|
||||
"integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==",
|
||||
"version": "1.0.30001684",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
|
||||
"integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
|
||||
"dev": true
|
||||
},
|
||||
"caseless": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "hedera-web",
|
||||
"version": "22.48.2",
|
||||
"version": "24.0.0",
|
||||
"description": "Verdnatura web page",
|
||||
"license": "GPL-3.0",
|
||||
"productName": "Salix",
|
||||
|
@ -68,7 +68,7 @@
|
|||
},
|
||||
"scripts": {
|
||||
"front": "webpack serve --open",
|
||||
"back": "cd ../vn-database && myvc start && cd ../salix && gulp backOnly",
|
||||
"back": "cd ../salix && gulp backOnly",
|
||||
"resetDatabase": "cd ../salix && gulp docker",
|
||||
"cy:open": "npm run resetDatabase && cd ../hedera-web && cypress open",
|
||||
"test:e2e": "npm run resetDatabase && cd ../hedera-web && cypress run",
|
||||
|
|
Loading…
Reference in New Issue