Merge branch 'master' into autogenerate

Author: jorgecotillo

.github/workflows/main.yml

@@ -3,7 +3,6 @@ name: CI
 on:
   pull_request:
     branches: [ master ]
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,6 +14,11 @@ jobs:
         uses: actions/setup-node@v2.1.2
         with:
           node-version: 10.x
+      
+      - name: GitHub context (actor and head ref)
+        run: |          
+          echo ${{ github.actor }}
+          echo ${{ github.head_ref }}
 
       - name: Install NPM modules
         run: npm ci
@@ -27,7 +31,9 @@ jobs:
   automerge:
     runs-on: ubuntu-latest
     needs: build
-    if: ${{ github.actor == 'AzureSDKAutomation' && startsWith(github.head_ref, 'sdkAuto/') }}
+    env:
+      PR_PREFIX: sdkAuto/
+    if: ${{ github.actor == 'openapi-sdkautomation[bot]' }}
     steps:
       - uses: actions/checkout@v2
 
@@ -43,7 +49,7 @@ jobs:
       - name: Check RP in Autogenlist
         run: |
           check_result='';
-          exec=$(npm run find-basepath ${{ github.head_ref }}); 
+          exec=$(npm run find-basepath ${{ github.head_ref }} $PR_PREFIX); 
           while read line; 
           do
             # overriding check_result until the last line is read, last line contains

generator/cmd/findbasepath.ts

@@ -9,7 +9,8 @@ executeSynchronous(async () => {
     }
 
     const prName = process.argv[2];
-    let basePath = prName.replace("sdkAutomation/", "");
+    const prPrefix = process.argv[3];
+    let basePath = prName.replace(prPrefix, "");
 
     // format basePath
     basePath = `${basePath}/resource-manager`;

sdkauto_afterscript.js

@@ -1,5 +1,18 @@
 const basePath = process.argv[2];
-require("child_process").execSync(`npm install --prefix generator`, {stdio: 'inherit'});
-require("child_process").execSync(`npm run postprocessor ${basePath} --prefix generator`, {stdio: 'inherit'});
-require("child_process").execSync(`npm install --prefix tools`, {stdio: 'inherit'});
-require("child_process").execSync(`npm run test --prefix tools`, {stdio: 'inherit'});
+require("child_process").execSync(`npm install --prefix generator`, {
+  stdio: "inherit",
+});
+require("child_process").execSync(
+  `npm run postprocessor ${basePath} --prefix generator`,
+  { stdio: "inherit" }
+);
+try {
+  require("child_process").execSync(`npm install --prefix tools`, {
+    stdio: "inherit",
+  });
+  require("child_process").execSync(`npm run test --prefix tools`, {
+    stdio: "inherit",
+  });
+} catch (e) {
+  console.error(e);
+}