Compare commits
3 Commits
1cd1e26751
...
v3.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
| c842befc8f | |||
| fb267a11f9 | |||
| a94acbf7d3 |
Vendored
+20
@@ -10,10 +10,28 @@ pipeline {
|
||||
steps {
|
||||
sh 'node -v'
|
||||
sh 'npm -v'
|
||||
script {
|
||||
String tag = sh(returnStdout: true, script: 'git tag --contains').trim()
|
||||
String branchName = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim()
|
||||
String commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
|
||||
String commitMsg = commit.substring(commit.indexOf(' ')).trim()
|
||||
|
||||
if (tag) {
|
||||
currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
|
||||
} else {
|
||||
currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
|
||||
}
|
||||
|
||||
String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
|
||||
currentBuild.description = "${author}<br />${commitMsg}"
|
||||
echo 'starting installing'
|
||||
sh 'npm ci'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('checks') {
|
||||
parallel {
|
||||
stage('eslint') {
|
||||
steps {
|
||||
sh 'npm run eslint'
|
||||
@@ -25,6 +43,8 @@ pipeline {
|
||||
sh 'npm run build'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('clean-all') {
|
||||
steps {
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "journal.pl",
|
||||
"version": "2.4.5",
|
||||
"version": "3.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "journal.pl",
|
||||
"version": "2.4.5",
|
||||
"version": "3.0.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@brojs/cli": "^0.0.4-alpha.9",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "journal.pl",
|
||||
"version": "2.4.5",
|
||||
"version": "3.0.0",
|
||||
"description": "bro-js platform journal ui repo",
|
||||
"main": "./src/index.tsx",
|
||||
"scripts": {
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ let rootElement: ReactDOM.Root
|
||||
export const mount = async (Сomponent, element = document.getElementById('app')) => {
|
||||
let user = null;
|
||||
try {
|
||||
await keycloak.init({ onLoad: "login-required" }); // 'login-required' });
|
||||
await keycloak.init({ onLoad: "login-required" });
|
||||
user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
|
||||
} catch (error) {
|
||||
console.error("Failed to initialize adapter:", error);
|
||||
|
||||
Reference in New Issue
Block a user