Skip to content

Commit 25e79f9

Browse files
committed
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
2 parents dd620f1 + 9f5f554 commit 25e79f9

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

.github/workflows/AutosarUmlActionExample.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,9 @@ jobs:
8383
id: baseDownload
8484
run: |
8585
git fetch origin ${{steps.CommitIds.outputs.baseCommitId}}
86-
$pointer = git cat-file blob ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}}
87-
$sha = ($pointer[1] -split(":"))[1]
88-
if($sha -ne $null){
89-
$shaPart1 = $sha.Substring(0,2)
90-
$shaPart2 = $sha.Substring(2,2)
91-
echo "Model SHA: $sha"
92-
git cat-file --filters ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}} | Out-Null
93-
copy ".git\lfs\objects\$shaPart1\$shaPart2\$sha" "${{env.ModelName}}_base.${{env.ModelExtension}}"
94-
echo "result=downloaded" >> $env:GITHUB_OUTPUT
86+
$contents = git cat-file blob ${{steps.CommitIds.outputs.baseCommitId}}:${{env.ModelName}}.${{env.ModelExtension}}
87+
if($contents -ne $null){
88+
$contents | Out-File -FilePath "${{env.ModelName}}_base.${{env.ModelExtension}}"
9589
}
9690
else{
9791
echo "result=notFound" >> $env:GITHUB_OUTPUT
@@ -113,12 +107,7 @@ jobs:
113107
run: |
114108
git fetch origin $env:GITHUB_HEAD_REF
115109
$pointer = git cat-file blob ${{steps.CommitIds.outputs.sourceCommitId}}":${{env.ModelName}}.${{env.ModelExtension}}"
116-
$sha = ($pointer[1] -split(":"))[1]
117-
$shaPart1 = $sha.Substring(0,2)
118-
$shaPart2 = $sha.Substring(2,2)
119-
echo "Model SHA: $sha"
120-
git cat-file --filters ${{steps.CommitIds.outputs.sourceCommitId}}":${{env.ModelName}}.${{env.ModelExtension}}" | Out-Null
121-
copy ".git\lfs\objects\$shaPart1\$shaPart2\$sha" "${{env.ModelName}}_head.${{env.ModelExtension}}"
110+
$pointer | Out-File -FilePath "${{env.ModelName}}_head.${{env.ModelExtension}}"
122111
- name: Check for merge conflicts
123112
if: steps.baseDownload.outputs.result == 'downloaded'
124113
id: mergeCheck

0 commit comments

Comments
 (0)