Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend-clients
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
frontend-clients
Commits
b183fc74
Commit
b183fc74
authored
1 year ago
by
OZGCloud
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into OZG-4857-dms-export-kommentare
parents
142db85e
b210c0e2
Branches
Branches containing commit
Tags
2.5.2
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Jenkinsfile.admin
+48
-0
48 additions, 0 deletions
Jenkinsfile.admin
alfa-client/package-lock.json
+2
-2
2 additions, 2 deletions
alfa-client/package-lock.json
alfa-client/package.json
+3
-1
3 additions, 1 deletion
alfa-client/package.json
with
53 additions
and
3 deletions
Jenkinsfile.admin
0 → 100644
+
48
−
0
View file @
b183fc74
pipeline {
agent {
node {
label 'ozgcloud-jenkins-build-agent'
}
}
environment {
BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/alfa/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
RELEASE_REGEX = /\d+.\d+.\d+/
SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
FAILED_STAGE = ""
SH_SUCCESS_STATUS_CODE = 0
}
options {
timeout(time: 1, unit: 'HOURS')
disableConcurrentBuilds()
buildDiscarder(logRotator(numToKeepStr: '5'))
}
// TODO check version
stage('build') {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
dir('alfa-client') {
sh 'echo "registry=https://nexus.ozg-sh.de/repository/npm-proxy" >> ~/.npmrc'
sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczprTSFnNVUhMVQzNDZxWQ==" >> ~/.npmrc'
sh 'npm cache verify'
sh 'npm install'
if (isReleaseBranch()) {
sh 'npm run ci-prodBuild-admin'
} else {
sh 'npm run ci-build-admin'
}
}
}
}
}
}
Boolean isReleaseBranch() {
return env.BRANCH_NAME == 'release'
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
alfa-client/package-lock.json
+
2
−
2
View file @
b183fc74
{
{
"name": "alfa",
"name": "alfa",
"version": "0.
0
.0",
"version": "0.
1
.0",
"lockfileVersion": 3,
"lockfileVersion": 3,
"requires": true,
"requires": true,
"packages": {
"packages": {
"": {
"": {
"name": "alfa",
"name": "alfa",
"version": "0.
0
.0",
"version": "0.
1
.0",
"license": "MIT",
"license": "MIT",
"dependencies": {
"dependencies": {
"@angular/animations": "16.2.11",
"@angular/animations": "16.2.11",
This diff is collapsed.
Click to expand it.
alfa-client/package.json
+
3
−
1
View file @
b183fc74
{
{
"name"
:
"alfa"
,
"name"
:
"alfa"
,
"version"
:
"0.
0
.0"
,
"version"
:
"0.
1
.0"
,
"license"
:
"MIT"
,
"license"
:
"MIT"
,
"scripts"
:
{
"scripts"
:
{
"start"
:
"nx run alfa:serve --port 4300 --disable-host-check"
,
"start"
:
"nx run alfa:serve --port 4300 --disable-host-check"
,
...
@@ -14,7 +14,9 @@
...
@@ -14,7 +14,9 @@
"test:lib"
:
"nx test ${npm_config_lib} --watchAll"
,
"test:lib"
:
"nx test ${npm_config_lib} --watchAll"
,
"test:debug:lib"
:
"nx test ${npm_config_lib} --detectOpenHandles --watchAll"
,
"test:debug:lib"
:
"nx test ${npm_config_lib} --detectOpenHandles --watchAll"
,
"ci-build"
:
"nx run alfa:build --outputHashing=all"
,
"ci-build"
:
"nx run alfa:build --outputHashing=all"
,
"ci-build-admin"
:
"nx run admin:build --outputHashing=all"
,
"ci-prodBuild"
:
"nx run alfa:build --outputHashing=all --configuration production"
,
"ci-prodBuild"
:
"nx run alfa:build --outputHashing=all --configuration production"
,
"ci-prodBuild-admin"
:
"nx run admin:build --outputHashing=all --configuration production"
,
"ci-test"
:
"nx run-many --target=test --parallel 8 -- --runInBand"
,
"ci-test"
:
"nx run-many --target=test --parallel 8 -- --runInBand"
,
"ci-sonar"
:
"nx run-many --target=test --parallel 8 -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && npx sonar-scanner"
,
"ci-sonar"
:
"nx run-many --target=test --parallel 8 -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && npx sonar-scanner"
,
"lint"
:
"nx workspace-lint && nx lint"
,
"lint"
:
"nx workspace-lint && nx lint"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment