Added github ci

nicolas63 · nicolas63 · commit eb648d8040ce · 2022-10-23T00:14:11.000+02:00
diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -24,7 +24,7 @@ jobs:
       with:
         node-version: ${{ matrix.node_version }}
     - name: 'install required npm version'
-      run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
+      run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants.cjs').NPM_VERSION);")
     - run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
       shell: bash
     - run: npm ci
diff --git a/.github/workflows/test-integration-jwt.yml b/.github/workflows/test-integration-jwt.yml
@@ -62,7 +62,7 @@ jobs:
               with:
                 node-version: ${{ matrix.node_version }}
             - name: 'install required npm version'
-              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
+              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants.cjs').NPM_VERSION);")
             - uses: joschi/setup-jdk@v2
               with:
                 java-version: '11' # The OpenJDK version to make available on the path
diff --git a/.github/workflows/test-integration-microservice.yml b/.github/workflows/test-integration-microservice.yml
@@ -35,7 +35,7 @@ jobs:
               with:
                 node-version: ${{ matrix.node_version }}
             - name: 'install required npm version'
-              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
+              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants.cjs').NPM_VERSION);")
             - uses: actions/setup-dotnet@v1
               with:
                 dotnet-version: '6.0.x'
diff --git a/.github/workflows/test-integration-oauth.yml b/.github/workflows/test-integration-oauth.yml
@@ -59,7 +59,7 @@ jobs:
               with:
                 node-version: ${{ matrix.node_version }}
             - name: 'install required npm version'
-              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants').NPM_VERSION);")
+              run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants.cjs').NPM_VERSION);")
             - uses: actions/setup-dotnet@v1
               with:
                 dotnet-version: '6.0.x'
diff --git a/generators/ci-cd/generator.mjs b/generators/ci-cd/generator.mjs
@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 import CiCdGenerator from 'generator-jhipster/esm/generators/ci-cd';
+import { GITHUB, GITLAB } from '../generator-dotnetcore-constants.mjs';
 import {
   PRIORITY_PREFIX,
   PROMPTING_PRIORITY,
@@ -28,8 +29,8 @@ export default class extends CiCdGenerator {
         if (this.ciType) return;
 
         const ciTypeChoices = [
-          { value: 'gitlab', name: 'Gitlab CI', },
-          { value: 'github', name: 'Github Action', },
+          { value: GITHUB , name: 'Github Action', },
+          { value: GITLAB, name: 'Gitlab CI', },          
         ];
 
         const answers = await this.prompt([
@@ -38,7 +39,7 @@ export default class extends CiCdGenerator {
             name: 'ciType',
             message: `What CI/CD pipeline do you want to generate ?`,
             choices: ciTypeChoices,
-            default: 'github',
+            default: GITHUB,
           },
         ]);
         this.ciType = this.blueprintConfig.ciType = answers.ciType;
@@ -63,7 +64,12 @@ export default class extends CiCdGenerator {
       async writingCiFiles() {
         await this.writeFiles({
           sections: {
-            files: [{ templates: ['template-file-app'] }],
+            files: [
+              { 
+                condition: ctx => ctx.ciType === GITHUB,
+                templates: ['.github/workflows/dotnet.yml'] 
+              },
+            ],
           },
           context: this,
         });
diff --git a/generators/ci-cd/templates/.github/workflows/dotnet.yml.ejs b/generators/ci-cd/templates/.github/workflows/dotnet.yml.ejs
@@ -0,0 +1,23 @@
+name: .NET
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal
diff --git a/generators/ci-cd/templates/template-file-app.ejs b/generators/ci-cd/templates/template-file-app.ejs
diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
diff --git a/generators/client/files-blazor.js b/generators/client/files-blazor.js
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const CLIENT_SRC_DIR = constants.CLIENT_SRC_DIR;
diff --git a/generators/client/files-common.js b/generators/client/files-common.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const baseConstants = require('generator-jhipster/generators/generator-constants');
 const { ANGULAR, REACT, VUE } = baseConstants.SUPPORTED_CLIENT_FRAMEWORKS;
 
diff --git a/generators/client/files-react.js b/generators/client/files-react.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
diff --git a/generators/client/files-vue.js b/generators/client/files-vue.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
diff --git a/generators/client/files-xamarin.js b/generators/client/files-xamarin.js
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const CLIENT_SRC_DIR = constants.CLIENT_SRC_DIR;
diff --git a/generators/client/index.js b/generators/client/index.js
@@ -20,7 +20,7 @@
 const chalk = require('chalk');
 const ClientGenerator = require('generator-jhipster/generators/client');
 // eslint-disable-next-line import/no-extraneous-dependencies
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const baseConstants = require('generator-jhipster/generators/generator-constants');
 const basePrompts = require('generator-jhipster/generators/client/prompts');
 const baseWriteAngularFiles = require('generator-jhipster/generators/client/files-angular').writeFiles;
diff --git a/generators/client/prompts.js b/generators/client/prompts.js
@@ -18,7 +18,7 @@
  */
 const chalk = require('chalk');
 const baseConstants = require('generator-jhipster/generators/generator-constants');
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 const { ANGULAR, REACT, VUE } = baseConstants.SUPPORTED_CLIENT_FRAMEWORKS;
 const BLAZOR = constants.BLAZOR;
diff --git a/generators/common/files.js b/generators/common/files.js
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 const files = {
     docker: [
diff --git a/generators/cypress/files-cypress.js b/generators/cypress/files-cypress.js
@@ -1,4 +1,4 @@
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
 
diff --git a/generators/entities-client/index.js b/generators/entities-client/index.js
@@ -19,7 +19,7 @@
 const EntitiesClientGenerator = require('generator-jhipster/generators/entities-client');
 const chalk = require('chalk');
 const customizeDotnetPaths = require('../utils').customizeDotnetPaths;
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 const BLAZOR = constants.BLAZOR;
 const XAMARIN = constants.XAMARIN;
diff --git a/generators/entity-client/files-blazor.js b/generators/entity-client/files-blazor.js
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const CLIENT_SRC_DIR = constants.CLIENT_SRC_DIR;
diff --git a/generators/entity-client/files-xamarin.js b/generators/entity-client/files-xamarin.js
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const CLIENT_SRC_DIR = constants.CLIENT_SRC_DIR;
diff --git a/generators/entity-client/index.js b/generators/entity-client/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable consistent-return */
 const EntityClientGenerator = require('generator-jhipster/generators/entity-client');
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const customizeDotnetPaths = require('../utils').customizeDotnetPaths;
 const writeBlazorFiles = require('./files-blazor').writeFiles;
 const writeXamarinFiles = require('./files-xamarin').writeFiles;
diff --git a/generators/entity-server/files.js b/generators/entity-server/files.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 const baseConstants = require('generator-jhipster/generators/generator-constants');
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const utils = require('../utils');
 
 /* Constants use throughout */
diff --git a/generators/entity/index.js b/generators/entity/index.js
@@ -5,7 +5,7 @@ const toPascalCase = require('to-pascal-case');
 const pluralize = require('pluralize');
 const _ = require('lodash');
 const utilsNet = require('../utils');
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const prompts = require('./prompts');
 const asModel = require('../utils').asModel;
 
diff --git a/generators/generator-dotnetcore-constants.cjs b/generators/generator-dotnetcore-constants.cjs
@@ -13,12 +13,14 @@ const PROJECT_SERVICE_SUFFIX = '.Domain.Services';
 const BLAZOR = 'Blazor';
 const XAMARIN = 'Xamarin';
 const TERRAFORM_DIR = 'terraform/';
+const GITHUB = 'Github';
+const GITLAB = 'Gitlab';
 
 // Version of Node, NPM
 const NODE_VERSION = '16.14.0';
 const NPM_VERSION = '8.6.0';
 
-const constants = {
+module.exports = {
     SERVER_SRC_DIR,
     CLIENT_SRC_DIR,
     CLIENT_TEST_DIR,
@@ -36,6 +38,6 @@ const constants = {
     TERRAFORM_DIR,
     NODE_VERSION,
     NPM_VERSION,
+    GITHUB,
+    GITLAB
 };
-
-module.exports = constants;
diff --git a/generators/generator-dotnetcore-constants.mjs b/generators/generator-dotnetcore-constants.mjs
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2019-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export {
+    SERVER_SRC_DIR,
+    CLIENT_SRC_DIR,
+    CLIENT_TEST_DIR,
+    SERVER_TEST_DIR,
+    PROJECT_DTO_SUFFIX,
+    PROJECT_DOMAIN_SUFFIX,
+    PROJECT_APPLICATION_SUFFIX,
+    PROJECT_TEST_SUFFIX,
+    DOCKER_DIR,
+    PROJECT_CROSSCUTTING_SUFFIX,
+    PROJECT_INFRASTRUCTURE_SUFFIX,
+    PROJECT_SERVICE_SUFFIX,
+    BLAZOR,
+    XAMARIN,
+    TERRAFORM_DIR,
+    NODE_VERSION,
+    NPM_VERSION,
+    GITHUB,
+    GITLAB
+} from "./generator-dotnetcore-constants.cjs";
diff --git a/generators/heroku/deploy.js b/generators/heroku/deploy.js
@@ -21,7 +21,7 @@ const ChildProcess = require('child_process');
 const util = require('util');
 const Which = require('which');
 const { OAUTH2 } = require('generator-jhipster/jdl/jhipster/authentication-types');
-const { BLAZOR } = require('../generator-dotnetcore-constants');
+const { BLAZOR } = require('../generator-dotnetcore-constants.cjs');
 
 const execFileCmd = util.promisify(ChildProcess.execFile);
 
diff --git a/generators/heroku/index.js b/generators/heroku/index.js
@@ -33,7 +33,7 @@ const {
     END_PRIORITY,
 } = require('generator-jhipster/lib/constants/priorities.cjs').compat;
 
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const build = require('./build');
 const deploy = require('./deploy');
 const provision = require('./provision');
diff --git a/generators/languages/files-languages.js b/generators/languages/files-languages.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
diff --git a/generators/languages/index.js b/generators/languages/index.js
@@ -7,7 +7,7 @@ const { ANGULAR, REACT, VUE } = baseConstants.SUPPORTED_CLIENT_FRAMEWORKS;
 
 const { writeFilesAngular, writeFilesReact, writeFilesVue } = require('./files-languages');
 // eslint-disable-next-line import/no-extraneous-dependencies
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const customizeDotnetPaths = require('../utils').customizeDotnetPaths;
 
 const BLAZOR = constants.BLAZOR;
diff --git a/generators/server/files.js b/generators/server/files.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 const mkdirp = require('mkdirp');
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 
 /* Constants use throughout */
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
diff --git a/generators/server/index.js b/generators/server/index.js
@@ -19,7 +19,7 @@
 /* eslint-disable consistent-return */
 const chalk = require('chalk');
 const ServerGenerator = require('generator-jhipster/generators/server');
-const constants = require('../generator-dotnetcore-constants');
+const constants = require('../generator-dotnetcore-constants.cjs');
 const dotnet = require('../dotnet');
 const customizeDotnetPaths = require('../utils').customizeDotnetPaths;
 const writeFiles = require('./files').writeFiles;
diff --git a/generators/utils.js b/generators/utils.js
@@ -20,7 +20,7 @@ const _ = require('lodash');
 const toPascalCase = require('to-pascal-case');
 const getEnumInfo = require('generator-jhipster/generators/utils').getEnumInfo;
 const packagejs = require('../package.json');
-const constants = require('./generator-dotnetcore-constants');
+const constants = require('./generator-dotnetcore-constants.cjs');
 
 const SERVER_SRC_DIR = constants.SERVER_SRC_DIR;
 const BLAZOR = constants.BLAZOR;
diff --git a/test/dto.spec.js b/test/dto.spec.js
@@ -2,7 +2,7 @@ const path = require('path');
 const fse = require('fs-extra');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
-const constants = require('../generators/generator-dotnetcore-constants');
+const constants = require('../generators/generator-dotnetcore-constants.cjs');
 
 const SERVER_MAIN_SRC_DIR = `${constants.SERVER_SRC_DIR}`;
 
diff --git a/test/enum.spec.js b/test/enum.spec.js
@@ -2,7 +2,7 @@ const path = require('path');
 const fse = require('fs-extra');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
-const constants = require('../generators/generator-dotnetcore-constants');
+const constants = require('../generators/generator-dotnetcore-constants.cjs');
 
 const SERVER_MAIN_SRC_DIR = `${constants.SERVER_SRC_DIR}`;
 
diff --git a/test/service.spec.js b/test/service.spec.js
@@ -2,7 +2,7 @@ const path = require('path');
 const fse = require('fs-extra');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
-const constants = require('../generators/generator-dotnetcore-constants');
+const constants = require('../generators/generator-dotnetcore-constants.cjs');
 
 const SERVER_MAIN_SRC_DIR = `${constants.SERVER_SRC_DIR}`;
 
