Skip to content

Commit

Permalink
Merge branch '193-incquery-autosar-uml-bridge' into 193-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
kkadosa committed Dec 6, 2023
2 parents 412e01a + f6e4d31 commit 50585f9
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/AutosarUmlActionExample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ jobs:
if: steps.baseDownload.outputs.result == 'downloaded'
id: mergeCheck
run: |
Test-Path ${{env.ModelName}}_base.${{env.ModelExtension}}
Test-Path ${{env.ModelName}}_target.${{env.ModelExtension}}
Test-Path ${{env.ModelName}}.${{env.ModelExtension}}
&"${{steps.GetLTA.outputs.LemonTreeAutomationExecutable}}" merge --base ${{env.ModelName}}_base.${{env.ModelExtension}} --theirs ${{env.ModelName}}_target.${{env.ModelExtension}} --mine ${{env.ModelName}}.${{env.ModelExtension}} --dryrun --sfs ${{ steps.session_file.outputs.result }} --abortOnConflict true
echo "::set-output name=result::$LASTEXITCODE"
echo "Return code: $LASTEXITCODE"
Expand Down

0 comments on commit 50585f9

Please sign in to comment.