arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop

Browse Source
This commit is contained in:
Erik Tiekstra
2021-04-28 10:01:12 +02:00
parent 86cd0195cf ca6f1b95e2
commit ddb542bdf2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -38,5 +38,5 @@ testem.log
.DS_Store .DS_Store
Thumbs.db Thumbs.db
mock-api/**/node_modules
mock-api/**/api.json mock-api/**/api.json

4
openshift/dev/Jenkinsfile vendored
View File

@@ -1,4 +1,4 @@
def cicdproject = "${CI_CD_NAMESPACE}" def cicdproject = "${CICD_NAMESPACE}"
def appname = "${APP_NAME}" def appname = "${APP_NAME}"
def devproject = "${DEV_NAMESPACE}" def devproject = "${DEV_NAMESPACE}"
def i1project = "${I1_NAMESPACE}" def i1project = "${I1_NAMESPACE}"
@@ -26,7 +26,7 @@ pipeline {
def packageJson = readJSON file: 'package.json' def packageJson = readJSON file: 'package.json'
BUILD_TAG = "dev_v${packageJson.version}_${env.BUILD_NUMBER}_${CURRENT_COMMIT}" BUILD_TAG = "dev_v${packageJson.version}_${env.BUILD_NUMBER}_${CURRENT_COMMIT}"
echo '### Build tag ###' echo '### Build tag ###'
echo "${BUILD_TAG}" echo "This is the build tag: ${BUILD_TAG}"
} }
echo '### Build tag generated! ###' echo '### Build tag generated! ###'
} }