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

LieberLieber · Dec 6, 2023 · 25e79f9 · 25e79f9
2 parents dd620f1 + 9f5f554
commit 25e79f9
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/.github/workflows/AutosarUmlActionExample.yml b/.github/workflows/AutosarUmlActionExample.yml
@@ -83,15 +83,9 @@ jobs:
         id: baseDownload
         run: |
           git fetch origin ${{steps.CommitIds.outputs.baseCommitId}}
-          $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
+          $contents = git cat-file blob ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}}
+          if($contents -ne $null){
+            $contents | Out-File -FilePath "${{env.ModelName}}_base.${{env.ModelExtension}}"
           }
           else{
             echo "result=notFound" >> $env:GITHUB_OUTPUT
@@ -113,12 +107,7 @@ jobs:
         run: |
           git fetch origin $env:GITHUB_HEAD_REF
           $pointer = git cat-file blob ${{steps.CommitIds.outputs.sourceCommitId}}":${{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.sourceCommitId}}":${{env.ModelName}}.${{env.ModelExtension}}" | Out-Null
-          copy ".git\lfs\objects\$shaPart1\$shaPart2\$sha" "${{env.ModelName}}_head.${{env.ModelExtension}}"
+          $pointer | Out-File -FilePath "${{env.ModelName}}_head.${{env.ModelExtension}}"
       - name: Check for merge conflicts
         if: steps.baseDownload.outputs.result == 'downloaded'
         id: mergeCheck