Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ups 4076 #347

Merged
merged 8 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ pipeline {
agent none

environment {
PIPELINE_VERSION = build.pipelineVersion()
REPOSITORY_NAME = 'uitpas-balie-frontend'
PIPELINE_VERSION = build.pipelineVersion()
REPOSITORY_NAME = 'uitpas-balie-frontend'
QT_QPA_PLATFORM = 'offscreen'
}

stages {
Expand All @@ -15,7 +16,7 @@ pipeline {
}

stage('Setup and build') {
agent { label 'ubuntu' && '16.04' && 'nodejs14' }
agent { label 'ubuntu' && '16.04' && 'nodejs16' }
environment {
GIT_SHORT_COMMIT = build.shortCommitRef()
ARTIFACT_VERSION = "${env.PIPELINE_VERSION}" + '+sha.' + "${env.GIT_SHORT_COMMIT}"
Expand Down
9 changes: 5 additions & 4 deletions lib/tasks/uitpas-balie-frontend/build.rake
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ namespace 'uitpas-balie-frontend' do
configuration_hash = { 'basePath' => '/app/', 'buildNumber' => calver_version }

system('npm install') or exit 1
system('bower install') or exit 1

system('angular_config hash -c config.dist.json > config.json') or exit 1
system('node_modules/bower/bin/bower install') or exit 1

system('angular_config hash -c config.dist.json > config.json')
config = JSON.load File.new('config.json')
File.open('config.json', 'w') { |file| file.write(config.merge!(configuration_hash).to_json) } or exit 1
File.open('config.json', 'w') { |file| file.write(config.merge!(configuration_hash).to_json) }

system('grunt build') or exit 1
system('node_modules/grunt-cli/bin/grunt build') or exit 1
end
end
2 changes: 1 addition & 1 deletion lib/tasks/uitpas-balie-frontend/build_artifact.rake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace 'uitpas-balie-frontend' do
-C dist -d rubygem-anglular-config \
-x '.git*' -x pkg -x vendor -x lib -x Rakefile -x Gemfile -x Gemfile.lock \
-x .bundle -x 'Jenkinsfile*' \
--prefix /var/www/uitpas-balie-frontend/web/app \
--prefix /var/www/uitpas-balie-api/web/app \
--before-remove lib/tasks/uitpas-balie-frontend/prerm \
--deb-user www-data --deb-group www-data \
--description '#{description}' --url '#{source}' --vendor '#{vendor}' \
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/uitpas-balie-frontend/prerm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

rm -rf /var/www/uitpas-balie-frontend/web/app/scripts/scripts.*.js
rm -rf /var/www/uitpas-balie-api/web/app/scripts/scripts.*.js

15 changes: 0 additions & 15 deletions lib/tasks/uitpas-balie-frontend/upstart/uitpas-website-frontend

This file was deleted.

Loading