verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #6915 test_master24_8 #2067

Merged
alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00
Conversation 0 Commits 561 Files Changed 306 +12
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cfcfa489b4 - Show all commits

8
Jenkinsfile vendored
View File

@ -92,6 +92,10 @@ pipeline {
expression { RUN_BUILD } expression { RUN_BUILD }
} }
steps { steps {
script {
def packageJson = readJSON file: 'package.json'
env.VERSION = packageJson.version
}
sh 'docker-compose build back' sh 'docker-compose build back'
} }
} }
@ -126,6 +130,10 @@ pipeline {
expression { RUN_BUILD } expression { RUN_BUILD }
} }
steps { steps {
script {
def packageJson = readJSON file: 'package.json'
env.VERSION = packageJson.version
}
sh 'gulp build' sh 'gulp build'
sh 'docker-compose build front' sh 'docker-compose build front'
} }

1
package.json
View File

@ -86,6 +86,7 @@
"jasmine-spec-reporter": "^7.0.0", "jasmine-spec-reporter": "^7.0.0",
"jest": "^26.0.1", "jest": "^26.0.1",
"jest-junit": "^8.0.0", "jest-junit": "^8.0.0",
"js-yaml": "^4.1.0",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"merge-stream": "^1.0.1", "merge-stream": "^1.0.1",
"minimist": "^1.2.5", "minimist": "^1.2.5",

3
pnpm-lock.yaml
View File

@ -220,6 +220,9 @@ devDependencies:
jest-junit: jest-junit:
specifier: ^8.0.0 specifier: ^8.0.0
version: 8.0.0 version: 8.0.0
js-yaml:
specifier: ^4.1.0
version: 4.1.0
json-loader: json-loader:
specifier: ^0.5.7 specifier: ^0.5.7
version: 0.5.7 version: 0.5.7