Ci/external publish pr

.github/workflows/it-report.yml

@@ -0,0 +1,18 @@
+name: IT Tests report
+
+on:
+  workflow_run:
+    workflows: ['Main CI']
+    types:
+      - completed
+
+jobs:
+  publish-report:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dorny/test-reporter@v1
+        with:
+          artifact: it-reports
+          name: IT Tests report
+          path: '**/*.xml'
+          reporter: jest-junit

.github/workflows/main.yml

@@ -77,17 +77,7 @@ jobs:
     with:
       version: ${{ needs.version.outputs.nextVersionTag }}
       prerelease: ${{ needs.version.outputs.isPreRelease == 'true' }}
-  publish-packages-pr:
-    uses: ./.github/workflows/publish.yml
-    if: ${{ github.event_name == 'pull_request' }}
-    permissions:
-      packages: write
-      contents: read
-    secrets: inherit
-    needs: [version, build]
-    with:
-      version: ${{ needs.version.outputs.nextVersionTag }}
-      prerelease: ${{ needs.version.outputs.isPreRelease == 'true' }}
+      isPullRequest: false
 
   documentation-main:
     secrets: inherit

.github/workflows/publish-pr.yml

@@ -0,0 +1,66 @@
+name: Publish PR
+
+on:
+  workflow_run:
+    workflows: ['Main CI']
+    types:
+      - completed
+
+jobs:
+  version:
+    if: ${{ github.event.workflow_run.event == 'pull_request' }}
+    permissions:
+      actions: read
+    runs-on: ubuntu-latest
+    outputs:
+      nextVersionTag: ${{ steps.newVersion.outputs.nextVersionTag }}
+    steps:
+      - name: get logs from workflow run
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let download = await github.rest.actions.downloadWorkflowRunLogs({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/logs.zip`, Buffer.from(download.data));
+      - run: unzip logs.zip
+      - name: extract version from logs
+        run: echo nextVersionTag=$(find *_version.txt | xargs grep -iPo '(?<=nextVersionTag variable has been set with ).*$') >> "$GITHUB_OUTPUT"
+
+  publish-packages-pr:
+    uses: ./.github/workflows/publish.yml
+    needs: [version]
+    permissions:
+      packages: write
+      contents: read
+    secrets: inherit
+    with:
+      version: ${{ needs.version.outputs.nextVersionTag }}
+      prerelease: true
+      isPullRequest: true
+
+  notify-parent:
+    runs-on: ubuntu-latest
+    needs: [publish-packages-pr]
+    permissions:
+      checks: write
+    steps:
+      - name: Update triggering workflow
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const backUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}/attempts/${context.runAttempt || 1}`;
+            await github.rest.checks.create({
+               head_sha: context.payload.workflow_run.head_commit.id,
+               name: 'publish packages',
+               conclusion: 'success',
+               status: 'completed',
+               output: {
+                  title: 'publish packages',
+                  summary: 'Successful publish [${backUrl}](${backUrl})'
+               },
+               ...context.repo
+            });

.github/workflows/publish.yml

@@ -12,6 +12,10 @@ on:
         default: false
         required: false
         description: Version of the artifact to publish
+      isPullRequest:
+        type: boolean
+        default: ${{ github.event_name == 'pull_request' }}
+        required: false
     secrets:
       AZURE_VSC_EXT_TOKEN:
         required: false
@@ -37,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
-    environment: ${{github.event_name == 'pull_request' && 'development' || 'production'}}
+    environment: ${{inputs.isPullRequest && 'development' || 'production'}}
     permissions:
       packages: write
       contents: read
@@ -55,7 +59,7 @@ jobs:
           is-prerelease: ${{ inputs.prerelease }}
           version: ${{ inputs.version }}
       - name: Publish
-        run: yarn run publish --tag=${{ github.event_name == 'pull_request' && 'pr' || steps.get-npm-tag.outputs.tag }} ${{ github.event_name == 'pull_request' && '--userconfig=./.npmrc.pr' || ''}} --always-auth=true
+        run: yarn run publish --tag=${{ inputs.isPullRequest && 'pr' || steps.get-npm-tag.outputs.tag }} ${{ inputs.isPullRequest && '--userconfig=./.npmrc.pr' || ''}} --always-auth=true
         env:
           GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -64,7 +68,7 @@ jobs:
           AZURE_EMAIL: ${{ secrets.AZURE_EMAIL }}
 
   publish-cascading:
-    if: github.event_name != 'pull_request'
+    if: '!inputs.isPullRequest'
     runs-on: ubuntu-latest
     env:
       APP_PATH: 'apps/github-cascading-app/dist'
@@ -100,7 +104,7 @@ jobs:
 
   publish-extensions:
     runs-on: ubuntu-latest
-    environment: ${{github.event_name == 'pull_request' && 'development' || 'production'}}
+    environment: ${{inputs.isPullRequest && 'development' || 'production'}}
     permissions:
       packages: write
       contents: read

.github/workflows/test-publish.yml

@@ -71,6 +71,12 @@ jobs:
         with:
           name: it-tests
           path: it-tests.zip
+      - name: Publish tests reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: it-reports
+          path: 'packages/**/dist-test/it-report.xml'
       - name: Stop verdaccio
         if: always()
         run: yarn verdaccio:stop

apps/github-cascading-app/src/cascading/cascading-probot.ts

@@ -142,8 +142,22 @@ export class CascadingProbot extends Cascading {
   /** @inheritdoc */
   protected async getBranches() {
     this.logger.debug('List remote branches');
-    const res = await this.options.octokit.repos.listBranches(this.options.repo);
-    return res.data.map(({name}) => name);
+    /* eslint-disable camelcase, @typescript-eslint/naming-convention */
+    const per_page = 100;
+    let pageIndex = 1;
+    let getCurrentPage = true;
+    const branchNames: string[] = [];
+    while (getCurrentPage && pageIndex <= 20) {
+      const res = await this.options.octokit.repos.listBranches({
+        ...this.options.repo,
+        per_page,
+        page: pageIndex++
+      });
+      branchNames.push(...res.data.map(({ name }) => name));
+      getCurrentPage = res.data.length === per_page;
+    }
+    return branchNames;
+    /* eslint-enable camelcase, @typescript-eslint/naming-convention */
   }
 
   /** @inheritdoc */

apps/github-cascading-app/src/cascading/cascading.ts

@@ -254,6 +254,7 @@ export abstract class Cascading {
     const openPr = await this.findOpenPullRequest(cascadingBranch, targetBranch);
 
     if (!openPr) {
+      this.logger.debug(`Will recreate the branch ${cascadingBranch}`);
       try {
         await this.deleteBranch(cascadingBranch);
         await this.createBranch(cascadingBranch, currentBranch);
@@ -263,6 +264,7 @@ export abstract class Cascading {
       }
       return this.createPullRequestWithMessage(cascadingBranch, currentBranch, targetBranch, config, true);
     } else {
+      this.logger.debug(`Updating the PR ${openPr.id}`);
       const message = await this.generatePullRequestBody({
         ...(openPr.context || { bypassReviewers: config.bypassReviewers, currentBranch, targetBranch, isConflicting: false}),
         bypassReviewers: false
@@ -344,14 +346,15 @@ export abstract class Cascading {
 
     const currentBranch = cascadingBranches[branchIndex];
     const targetBranch = cascadingBranches[branchIndex + 1];
-    const cascadingBranch = this.determineCascadingBranchName(currentBranch.semver?.format() || currentBranch.branch, targetBranch.semver?.format() || targetBranch.branch);
+    let cascadingBranch = this.determineCascadingBranchName(currentBranch.semver?.format() || currentBranch.branch, targetBranch.semver?.format() || targetBranch.branch);
     const isAhead = await this.isBranchAhead(currentBranch.branch, targetBranch.branch);
 
     if (!isAhead) {
       this.logger.info(`${currentBranch.branch} is not ahead of ${targetBranch.branch}. The cascading process will be skipped`);
       return;
     }
 
+    let isConflicting = false;
     if (branches.includes(cascadingBranch)) {
       try {
         await this.merge(currentBranch.branch, cascadingBranch);
@@ -372,10 +375,12 @@ export abstract class Cascading {
           this.logger.warn(`Fail to remove the cascading branch "${cascadingBranch}"`);
         }
         const conflictCascadingBranch = this.determineCascadingBranchName(currentBranch.semver?.format() || currentBranch.branch, targetBranch.semver?.format() || targetBranch.branch, true);
+        isConflicting = true;
         await this.createBranch(conflictCascadingBranch, currentBranch.branch);
+        cascadingBranch = conflictCascadingBranch;
       }
     }
-    await this.createPullRequestWithMessage(cascadingBranch, currentBranch.branch, targetBranch.branch, config);
+    await this.createPullRequestWithMessage(cascadingBranch, currentBranch.branch, targetBranch.branch, config, isConflicting);
   }
 
   /**

nx.json

@@ -135,6 +135,11 @@
         "^specs"
       ]
     },
+    "test-int": {
+      "outputs": [
+        "{projectRoot}/dist-test/it-report.xml"
+      ]
+    },
     "prepare-publish": {
       "outputs": [
         "{projectRoot}/dist/package.json"

packages/@ama-sdk/create/package.json

@@ -19,7 +19,7 @@
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
     "@angular-devkit/schematics-cli": "~16.0.5",
-    "@openapitools/openapi-generator-cli": "~2.6.0",
+    "@openapitools/openapi-generator-cli": "~2.7.0",
     "@schematics/angular": "~16.0.5",
     "minimist": "^1.2.6",
     "typescript": "~5.0.2"

packages/@ama-sdk/create/src/index.it.spec.ts

@@ -14,6 +14,7 @@ const cacheFolderPath = path.join(currentFolder, '.cache', appName);
 const execAppOptions: ExecSyncOptions = {
   cwd: sdkFolderPath,
   stdio: 'inherit',
+  timeout: 15 * 60 * 1000,
   /* eslint-disable @typescript-eslint/naming-convention, camelcase */
   env: {
     ...process.env,

packages/@ama-sdk/create/testing/jest.config.it.js

@@ -12,6 +12,7 @@ module.exports = {
   ],
   reporters: [
     'default',
+    ['jest-junit', {outputDirectory: resolve(__dirname, '..', 'dist-test'), outputName: 'it-report.xml'}],
     'github-actions'
   ],
   globals: {
@@ -23,5 +24,6 @@ module.exports = {
   },
   testMatch: [
     '<rootDir>/**/*.it.spec.ts'
-  ]
+  ],
+  testTimeout: 30 * 60 * 1000
 };

packages/@ama-sdk/generator-sdk/package.json

@@ -74,6 +74,7 @@
     "eslint-plugin-unicorn": "^47.0.0",
     "isomorphic-fetch": "~3.0.0",
     "jest": "~29.6.0",
+    "jest-junit": "^16.0.0",
     "mem-fs": "^2.2.1",
     "npm-run-all": "^4.1.5",
     "onchange": "^7.0.2",

packages/@ama-sdk/generator-sdk/testing/jest.config.it.js

@@ -12,6 +12,7 @@ module.exports = {
   ],
   reporters: [
     'default',
+    ['jest-junit', {outputDirectory: resolve(__dirname, '..', 'dist-test'), outputName: 'it-report.xml'}],
     'github-actions'
   ],
   globals: {
@@ -23,5 +24,6 @@ module.exports = {
   },
   testMatch: [
     '<rootDir>/**/*.it.spec.ts'
-  ]
+  ],
+  testTimeout: 30 * 60 * 1000
 };

packages/@ama-sdk/schematics/package.json

@@ -46,7 +46,7 @@
     "@angular-devkit/schematics": "~16.0.5",
     "@angular-devkit/schematics-cli": "~16.0.5",
     "@angular/cli": "~16.0.5",
-    "@openapitools/openapi-generator-cli": "~2.6.0",
+    "@openapitools/openapi-generator-cli": "~2.7.0",
     "@schematics/angular": "~16.0.5"
   },
   "dependencies": {
@@ -69,7 +69,7 @@
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
     "@o3r/schematics": "workspace:^",
-    "@openapitools/openapi-generator-cli": "~2.6.0",
+    "@openapitools/openapi-generator-cli": "~2.7.0",
     "@schematics/angular": "~16.0.5",
     "@types/jest": "~29.5.2",
     "@types/js-yaml": "^4.0.5",
@@ -89,6 +89,7 @@
     "eslint-plugin-unicorn": "^47.0.0",
     "isomorphic-fetch": "~3.0.0",
     "jest": "~29.6.0",
+    "jest-junit": "^16.0.0",
     "mem-fs": "^2.2.1",
     "npm-run-all": "^4.1.5",
     "nx": "~16.5.0",

packages/@ama-sdk/schematics/schematics/java/client-core/index.ts

@@ -83,7 +83,7 @@ export function ngGenerateJavaClientCore(options: NgGenerateJavaClientCoreSchema
       specPath,
       codegenLanguage: 'javaClient',
       apiTests: false,
-      specConfigPath: options.specConfigPath
+      specConfigPath: options.specConfigPath || undefined
     })
   ]);
 }

packages/@ama-sdk/schematics/schematics/java/client-core/schema.json

@@ -15,8 +15,7 @@
     },
     "specConfigPath": {
       "type": "string",
-      "description": "Swagger config file\nMore info: https://openapi-generator.tech/docs/generators/java/#config-options",
-      "default": ""
+      "description": "Swagger config file\nMore info: https://openapi-generator.tech/docs/generators/java/#config-options"
     }
   },
   "additionalProperties": true,

packages/@ama-sdk/schematics/schematics/java/client-core/schema.ts

@@ -5,5 +5,5 @@ export interface NgGenerateJavaClientCoreSchematicsSchema extends JsonObject {
   specPath: string;
 
   /** Swagger config file */
-  specConfigPath: string;
+  specConfigPath: string | null;
 }

packages/@ama-sdk/schematics/schematics/typescript/core/schema.json

@@ -15,13 +15,11 @@
     },
     "specConfigPath": {
       "type": "string",
-      "description": "Spec config file\nMore info: https://openapi-generator.tech/docs/generators/typescript/#config-options",
-      "default": ""
+      "description": "Spec config file\nMore info: https://openapi-generator.tech/docs/generators/typescript/#config-options"
     },
     "directory": {
       "type": "string",
-      "description": "Directory where to generate the SDK",
-      "default": ""
+      "description": "Directory where to generate the SDK"
     },
     "packageManager": {
       "type": "string",

packages/@ama-sdk/schematics/schematics/typescript/core/schema.ts

@@ -5,11 +5,11 @@ export interface NgGenerateTypescriptSDKCoreSchematicsSchema extends JsonObject
   specPath: string;
 
   /** Directory where to generate the SDK */
-  directory: string;
+  directory: string | null;
 
   /** Package manager to be used in the generated SDK */
   packageManager: 'npm' | 'yarn' | '';
 
   /** Path to the spec generation configuration */
-  specConfigPath: string;
+  specConfigPath: string | null;
 }