Merge branch '193-incquery-autosar-uml-bridge' into 193-testing

kkadosa · kkadosa · commit 673360aec864 · 2023-12-08T09:50:41.000+01:00
diff --git a/.github/workflows/AutosarUmlActionExample.yml b/.github/workflows/AutosarUmlActionExample.yml
@@ -15,8 +15,8 @@ name: Review with IncQuery AUTOSAR-UML Bridge
       - synchronize
       - review_requested
 env:
-  ModelName: counting-logic
-  ModelExtension: qeax
+  ModelName: DemoModel
+  ModelExtension: eapx
   ReviewSessionURL: 'https://nexus.lieberlieber.com/repository/lemontree-session'
   LemonTreePipelineToolsRemovePrerenderedDiagramsExecutable: https://nexus.lieberlieber.com/repository/lemontree-pipeline-tools/LemonTree.Pipeline.Tools.RemovePrerenderedDiagrams.exe
 jobs:
@@ -27,7 +27,7 @@ jobs:
     runs-on: windows-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           lfs: true
@@ -40,15 +40,15 @@ jobs:
         uses: IncQueryLabs/incquery-suite-bridge-autosar-uml-action@v1
         with:
           arxml_folder_path: example-arxml
-          ea_model_file_path: 'counting-logic.qeax'
+          ea_model_file_path: 'DemoModel.eapx'
           incquery_username: '${{ secrets.INCQUERY_USERNAME }}'
           incquery_password: '${{ secrets.INCQUERY_PASSWORD }}'
           license: '${{ secrets.INCQUERY_AUTOSAR_UML_INTEGRATION_LICENSE }}'
       - name: Push updated model
         run: |
           git config --local user.name "Automatic Model Update"
           git config --local user.email "username@users.noreply.github.com"
-          git add counting-logic.qeax
+          git add DemoModel.eapx
           git commit -m "Automatic Model Update"
           git push
       - name: Get relevant commit IDs
@@ -79,21 +79,25 @@ jobs:
             const filename = [repoName, 'PR', prNumber, baseSHA, headSHA].join('-') + '.ltsfs'
             console.log(`Filename will be: ${filename}`)
             return filename
+
       - name: Download base-commit file
         id: baseDownload
         run: |
           git fetch origin ${{steps.CommitIds.outputs.baseCommitId}}
-          $contents = git cat-file blob ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}}
-          echo $contents[1]
-          if($contents -ne $null){
-            echo "ps"
-            $contents | Out-File -FilePath "${{env.ModelName}}_base.${{env.ModelExtension}}"
+          $pointer = git cat-file blob ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}}
+          $sha = ($pointer[1] -split(":"))[1]
+          if($sha -ne $null){
+            $shaPart1 = $sha.Substring(0,2)
+            $shaPart2 = $sha.Substring(2,2)
+            echo "Model SHA: $sha"
+            git cat-file --filters ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}} | Out-Null
+            copy ".git\lfs\objects\$shaPart1\$shaPart2\$sha" "${{env.ModelName}}_base.${{env.ModelExtension}}"
             echo "result=downloaded" >> $env:GITHUB_OUTPUT
           }
-          else {
-            echo "no"
+          else{
             echo "result=notFound" >> $env:GITHUB_OUTPUT
           }
+          
       - name: Post new model comment to PR
         if: steps.baseDownload.outputs.result == 'notFound'
         uses: actions/github-script@v6
@@ -103,15 +107,66 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: `Model not found on base commit or fork-off point`
+              body: `Model not found on base commit / fork-off point`
             })
-      - name: Download target file
+            
+      - name: Download target branch head file
         if: steps.baseDownload.outputs.result == 'downloaded'
         id: headDownload
         run: |
           git fetch origin $env:GITHUB_HEAD_REF
-          $pointer = git cat-file blob ${{steps.CommitIds.outputs.targetCommitId}}":${{env.ModelName}}.${{env.ModelExtension}}"
-          $pointer | Out-File -FilePath "${{env.ModelName}}_target.${{env.ModelExtension}}"
+          $pointer = git cat-file blob ${{steps.CommitIds.outputs.targetId}}":${{env.ModelName}}.${{env.ModelExtension}}"
+          $sha = ($pointer[1] -split(":"))[1]
+          $shaPart1 = $sha.Substring(0,2)
+          $shaPart2 = $sha.Substring(2,2)
+          echo "Model SHA: $sha"
+          git cat-file --filters ${{steps.CommitIds.outputs.targetId}}":${{env.ModelName}}.${{env.ModelExtension}}" | Out-Null
+          copy ".git\lfs\objects\$shaPart1\$shaPart2\$sha" "${{env.ModelName}}_head.${{env.ModelExtension}}"
+      
+      # download Lemontree.Automation on a runner and setup the license
+      - uses: LieberLieber/setup-LemonTree.Automation@v1
+        id: GetLTA
+        with:
+          License: ${{secrets.LTALICENSE}} 
+      #ExeLocation &"${{steps.GetLTA.outputs.LemonTreeAutomationExecutable}}"
+      
+      - name: Check for merge conflicts
+        if: steps.baseDownload.outputs.result == 'downloaded'
+        id: mergeCheck
+        run: |
+          &"${{steps.GetLTA.outputs.LemonTreeAutomationExecutable}}" merge --base ${{env.ModelName}}_base.${{env.ModelExtension}} --theirs ${{env.ModelName}}.${{env.ModelExtension}} --mine ${{env.ModelName}}_head.${{env.ModelExtension}} --dryrun --sfs ${{ steps.session_file.outputs.result }} --abortOnConflict true
+          echo "::set-output name=result::$LASTEXITCODE"
+          echo "Return code: $LASTEXITCODE"
+          if($LASTEXITCODE -eq 0){
+            echo "No merge conflicts, setting message"
+            echo "message=[Review Session file](${{env.ReviewSessionURL}}/${{ steps.session_file.outputs.result }})\n:heavy_check_mark: **No merge conflicts in model**\n\nInstall [LemonTree 3.3+](https://www.lieberlieber.com/lemontree/en/) to open the Review Session file." >> $env:GITHUB_OUTPUT
+          }
+          elseif($LASTEXITCODE -eq 2){
+            echo "Internal Error when diffing. Please report such errors to support@lieberlieber.com"
+            exit 2
+          }
+          elseif($LASTEXITCODE -eq 3){
+            echo "Merge conflicts, setting message"
+            echo "message=[Review Session file](${{env.ReviewSessionURL}}/${{ steps.session_file.outputs.result }})\n:x: **Please resolve merge conflicts in model first**\n\nInstall [LemonTree 3.3+](https://www.lieberlieber.com/lemontree/en/) to open the Review Session file." >> $env:GITHUB_OUTPUT
+            exit 0
+          }
+          elseif($LASTEXITCODE -eq 6){
+            echo "Licensing issue of LemonTree.Automation"
+          }
+          else{
+            echo "Unknown error"
+          }    
+
+      # - name: Remove DIAGRAMIMAGEMAPS for Diff
+      #   if: steps.mergeCheck.outputs.result == 0
+      #   run: |
+      #     while (Test-Path Alias:curl) {Remove-Item Alias:curl} #remove the alias binding from curl to Invoke-WebRequest
+      #     curl "${{env.LemonTreePipelineToolsRemovePrerenderedDiagramsExecutable}}" --output LemonTree.Pipeline.Tools.RemovePrerenderedDiagrams.exe
+      #     echo ".\LemonTree.Pipeline.Tools.RemovePrerenderedDiagrams.exe remove --Model ${{env.ModelName}}_base.${{env.ModelExtension}}"
+      #     .\LemonTree.Pipeline.Tools.RemovePrerenderedDiagrams.exe remove --Model ${{env.ModelName}}_base.${{env.ModelExtension}}
+      #     echo ".\LemonTree.Pipeline.Tools.RemovePrerenderedDiagrams.exe remove --Model ${{env.ModelName}}_head.${{env.ModelExtension}}"
+      #     .\LemonTree.Pipeline.Tools.RemovePrerenderedDiagrams.exe remove --Model ${{env.ModelName}}_head.${{env.ModelExtension}}
+          
       - name: Create review session file
         id: checkSession
         run: |
@@ -121,17 +176,23 @@ jobs:
           echo $output
           ForEach ($line in $($output -split "`r`n"))
           {
-              if ($line.EndsWith('Found 0 different elements.'))
-              {
-                echo "No differences we don't need to publish the session file."
-              $Message = ":heavy_check_mark: **Model is identical!**"
-                $sfsfilename =""; 
-              }
+            $output = &'${{steps.GetLTA.outputs.LemonTreeAutomationExecutable}}' diff --theirs ${{env.ModelName}}_base.${{env.ModelExtension}} --mine ${{env.ModelName}}_head.${{env.ModelExtension}} --sfs ${{ steps.session_file.outputs.result }}
+            echo $output
+            ForEach ($line in $($output -split "`r`n"))
+            {
+                if ($line.EndsWith('Found 0 different elements.'))
+                {
+                  echo "No differences we don't need to publish the session file."
+                  $Message = ":heavy_check_mark: **Model is identical!**"
+                  $sfsfilename =""; 
+                }                
+            }
           }
           echo "$Message"
           echo "SfsFileName=$sfsfilename" >> $env:GITHUB_OUTPUT
           echo "message=$Message" >> $env:GITHUB_OUTPUT
           exit 0
+
       - name: Upload
         if: steps.baseDownload.outputs.result == 'downloaded'
         run: |
@@ -147,13 +208,15 @@ jobs:
             while (Test-Path Alias:curl) {Remove-Item Alias:curl} #remove the alias binding from curl to Invoke-WebRequest
             curl "-u${{secrets.NEXUSAUTHENTICATION}}" -T $sessionFileName $targetUrl
           }
+
       - name: Archive Session Files
         if: steps.baseDownload.outputs.result == 'downloaded'
         uses: actions/upload-artifact@v3
         with:
           name: Review Session File
-          path: '${{ steps.session_file.outputs.result }}'
+          path: ${{ steps.session_file.outputs.result }}
           retention-days: 5
+
       - name: Create PR comment
         if: steps.baseDownload.outputs.result == 'downloaded'
         uses: actions/github-script@v6
