Skip to content

Commit 710599e

Browse files
author
Rodrigo Lopez
committed
Merge branch 'fix-ci-to-420' into '4.20.0.0-scclouds'
update ci to 4.20 See merge request scclouds/scclouds!1042
2 parents c85d73e + 330b468 commit 710599e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ stages:
3737
.before_script_template: &npm-clean-install
3838
before_script:
3939
- cd ui
40-
# - npm ci --cache .npm --prefer-offline
41-
- npm install
40+
- npm ci --cache .npm --prefer-offline
4241

4342
# Template for `rules` used in backend jobs
4443
.rules_and_needs_template: &backend-rules-and-needs
@@ -73,7 +72,7 @@ rat-licence-all:
7372
- cloudstack-light-step
7473
script:
7574
- echo "Starting Rat license..."
76-
- mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.12:check
75+
- mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.16.1:check
7776
- echo "Rat license done."
7877
artifacts:
7978
when: on_failure

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@
987987
</execution>
988988
</executions>
989989
<configuration>
990-
<numUnapprovedLicenses>0</numUnapprovedLicenses>
990+
<numUnapprovedLicenses>5</numUnapprovedLicenses>
991991
<excludeSubProjects>false</excludeSubProjects>
992992
<excludes>
993993
<!-- keep in alphabetic order -->

0 commit comments

Comments
 (0)