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.

Sign up for GitHub

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

Jump to bottom

Add snapshot test to others generators. #15005

Merged
merged 2 commits into from
May 17, 2021
Merged

Add snapshot test to others generators. #15005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
accac71
Add snapshot test to others generators.
mshima May 15, 2021
51f35b6
Use node and npm version from pom.xml.
mshima May 15, 2021
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
2 changes: 1 addition & 1 deletion generators/ci-cd/templates/.gitlab-ci.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ before_script:
- export MAVEN_USER_HOME=`pwd`/.maven
<%_ if (!skipClient) { _%>
<%_ if (!insideDocker) { _%>
- ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v<%= NODE_VERSION %> -DnpmVersion=<%= NPM_VERSION %> -Dmaven.repo.local=$MAVEN_USER_HOME
- ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm@install-node-and-npm -Dmaven.repo.local=$MAVEN_USER_HOME
- ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:<%= clientPackageManager %> -Dmaven.repo.local=$MAVEN_USER_HOME
<%_ } _%>
<%_ } _%>
Expand Down
2 changes: 1 addition & 1 deletion generators/ci-cd/templates/jenkins/Jenkinsfile.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ node {

<%_ if (!skipClient) { _%>
<%= indent %> stage('install tools') {
<%= indent %> sh "./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v<%= NODE_VERSION %> -DnpmVersion=<%= NPM_VERSION %>"
<%= indent %> sh "./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm@install-node-and-npm"
<%= indent %> }

<%= indent %> stage('npm install') {
Expand Down
4 changes: 2 additions & 2 deletions generators/server/templates/pom.xml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install node and npm</id>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
Expand Down Expand Up @@ -1702,7 +1702,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install node and npm</id>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
Expand Down
Loading