Merge remote-tracking branch 'upstream/main' into main

Author: dixyushi

.github/workflows/syntaxCheckPullRequest.yml

@@ -1,13 +1,12 @@
 name: Check PR Katacoda Syntax
-
+env:
+  PR_NUMBER: ${{github.event.number}}
 on:
   pull_request_target:
     branches: [ main ]
 jobs:
   setup-matrix:
     runs-on: ubuntu-latest
-    env:
-      PR_NUMBER: ${{github.event.number}}
 
     steps:
       - name: Checkout playbooks
@@ -18,8 +17,10 @@ jobs:
         run: npm install
       - name: Select Changed Files
         id: changedfiles
-        run: |
-          node selectChangedFiles.js
+        run: node selectChangedFiles.js
+      - name: Get branch
+        id: get_branch
+        run: node getHeadRef.js
       - name: Setup matrix combinations
         id: setup-matrix-combinations
         run: |
@@ -34,6 +35,7 @@ jobs:
           echo ::set-output name=matrix-combinations::{\"include\":[$MATRIX_PARAMS_COMBINATIONS]}
     outputs:
       matrix-combinations: ${{ steps.setup-matrix-combinations.outputs.matrix-combinations }}
+      head_ref: ${{ steps.get_branch.outputs.head_ref}}
 
   build:
     runs-on: ubuntu-latest
@@ -45,31 +47,24 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: devonfw-tutorials/tutorial-compiler
-      
       - name: Checkout playbooks
         uses: actions/checkout@v2
         with:
           repository: devonfw-tutorials/tutorials
+          ref: ${{needs.setup-matrix.outputs.head_ref}}
           path: playbooks
-      
       - uses: actions/setup-node@v2-beta
-      
       - name: install TS
         run: npm install typescript
-      
       - name: npm install
         run: npm install
-
-      - name: run buildRun.sh --user ${{ github.actor }} --branch ${{ github.event.pull_request_target.head.ref }} --checkSyntax
-        run: |
-          sh buildRun.sh --user ${{ github.actor }} --branch ${{ github.event.pull_request_target.head.ref }} --checkSyntax -p ${{ matrix.tutorial }} -e test_console
-      
+      - name: run buildRun.sh --user ${{ github.actor }} --branch ${{needs.setup-matrix.outputs.head_ref}} --checkSyntax
+        run: sh buildRun.sh --user ${{ github.actor }} --branch ${{needs.setup-matrix.outputs.head_ref}} --checkSyntax -p ${{ matrix.tutorial }} -e test_console
       - name: Check error file existence
         id: check_files
         uses: andstor/file-existence-action@v1
         with:
           files: "./build/errors/syntaxErrors.md"
-          
       - name: Get message
         id: get_message
         if: steps.check_files.outputs.files_exists == 'true'
@@ -80,11 +75,10 @@ jobs:
           message="${message//$'\r'/'%0D'}"
           echo "${message}"
           echo "::set-output name=message::$message"
-
       - name: Request changes
         if:  ${{ steps.get_message.outputs.message != '' }}
         uses: andrewmusgrave/automatic-pull-request-review@0.0.2
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           event: COMMENT
-          body: ${{ steps.get_message.outputs.message }}
+          body: ${{ steps.get_message.outputs.message }}

devon4ng-architecture/files/layers-explained.md

@@ -1,5 +1,5 @@
-The applciation you see here is a clone of devon4ng-application-template. You can find it here [here](https://github.com/devonfw/devon4ng-application-template)
+The application you see here is a clone of devon4ng-application-template. You can find it [here](https://github.com/devonfw/devon4ng-application-template)
 
-The `SampleDataModule` is a nice exmple of the different layers explained. It holds some components (representing the *components* layer) and also has a `SampleDataService` (representing the *service* layer) which is imported in the required components.
+The `SampleDataModule` is a nice example of the different layers explained. It holds some components (representing the *components* layer) and also has a `SampleDataService` (representing the *service* layer) which is imported in the required components.
 
 The service acts as the adapter element explained earlier (used to make XHR calls). 

devon4ng-architecture/index.asciidoc

@@ -68,4 +68,6 @@ To conclude, in this tutorial you learned
 * the different types of modules - core, shared and feature
 
 Then we referred a devon4ng application by cloning it and traversing through its files. You can study in more detail about Angular architecture by following [this document](https://devonfw.com/website/pages/docs/master-devon4ng.asciidoc_architecture.html#meta-architecture.asciidoc_devonfw-reference-client-architecture).
+
+The idea with devon4ng is to define an architecture which is a compromise between, on the one hand, leveraging the best practices and latest trends like reactive style development, on the other hand, providing a short onboarding time while still using an architecture that helps us scale and be productive at the same time.
 ====

getHeadRef.js

@@ -0,0 +1,26 @@
+const core = require("@actions/core");
+const { Octokit } = require("@octokit/core");
+const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN });
+
+async function getHeadRef() {
+    let pr = process.env.PR_NUMBER;
+    let ref ="";
+    try {
+        let get = await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}', {
+            owner: 'devonfw-tutorials',
+            repo: 'tutorials',
+            pull_number: pr
+        });
+        ref = get.data.head.ref;
+    } catch(e) {
+        throw e;
+    }
+    core.info(`Head Ref: ${ref}`);
+    core.setOutput('head_ref', ref);
+}
+
+getHeadRef().catch(err => {
+    console.log(err);
+    process.exit(1); 
+});
+