Skip to content

Commit

Permalink
Merge pull request #25738 from mshima/node-env
Browse files Browse the repository at this point in the history
add node to renovate
  • Loading branch information
DanielFran committed Apr 4, 2024
2 parents ac3dedf + 6195dff commit 1d0a1c2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
6 changes: 5 additions & 1 deletion generators/generator-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { readFileSync } from 'fs';
import { join } from 'path';
import { fileURLToPath } from 'url';

export const BLUEPRINT_API_VERSION = 'jhipster-8';
// jhipster-bom version
export const JHIPSTER_DEPENDENCIES_VERSION = '8.3.0-SNAPSHOT';
Expand All @@ -26,7 +30,7 @@ export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
export const ADD_SPRING_MILESTONE_REPOSITORY = false;

// Version of Node, NPM
export const NODE_VERSION = '20.12.1';
export const NODE_VERSION = readFileSync(join(fileURLToPath(import.meta.url), '../init/resources/.node-version'), 'utf-8').trim();
export const OPENAPI_GENERATOR_CLI_VERSION = '2.13.1';

// The version should be coherent with the one from spring-data-elasticsearch project
Expand Down
1 change: 1 addition & 0 deletions generators/init/resources/.node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20.12.1
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended", ":disableDependencyDashboard"],
"enabledManagers": ["maven-wrapper", "gradle-wrapper"]
"enabledManagers": ["maven-wrapper", "gradle-wrapper", "nodenv"]
}
2 changes: 1 addition & 1 deletion test-integration/scripts/00-init-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if [[ "$JHI_CLI" == "" ]]; then
fi

# node version
JHI_NODE_VERSION=$(grep -o "NODE_VERSION = '[^']*'" $JHI_HOME/generators/generator-constants.js | cut -f2 -d "'")
JHI_NODE_VERSION=$(cat $JHI_HOME/generators/init/resources/.node-version)

# npm version
JHI_NPM_VERSION=$(grep -o '"npm": "[^"]*"' $JHI_HOME/generators/common/resources/package.json | cut -f4 -d '"')
Expand Down

0 comments on commit 1d0a1c2

Please sign in to comment.