From 937f75ec6333908978bbfe7f4b466738fcc3a429 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 12 Jun 2024 07:40:04 +0200 Subject: [PATCH 1/2] feat(jenkinsfile): use build_id --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7cad5ef41..1766e3aea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { sh 'quasar build' script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" } dockerBuild() } @@ -106,7 +106,7 @@ pipeline { steps { script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" } withKubeConfig([ serverUrl: "$KUBERNETES_API", From 135e05b139999b2ef033d820e3876c333e2fcd75 Mon Sep 17 00:00:00 2001 From: guillermo Date: Wed, 12 Jun 2024 12:00:43 +0200 Subject: [PATCH 2/2] hotfix: refs #6636 EN i18n --- src/i18n/locale/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 0ce21e9b2..9bc792aee 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -575,6 +575,9 @@ claim: created: Created state: State pickup: Pick up + null: No + agency: Agency + delivery: Delivery photo: fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}' noData: 'There are no images/videos, click here or drag and drop the file'