@@ -20,13 +20,17 @@ jobs:
2020
2121 - name : " Read model name"
2222 run : |
23- echo "MODEL_PATH=$(cat build/model.txt)" >> $GITHUB_ENV
23+ mp=$(cat build/model.txt)
24+ mp=$(echo "$mp" | tr -d '\r' | xargs)
25+ mb=$(basename "$mp")
26+ printf 'MODEL_PATH=%s\n' "$mp" >> $GITHUB_ENV
27+ printf 'MODEL_BASENAME=%s\n' "$mb" >> $GITHUB_ENV
2428
2529 - name : Download and run FMUchecker
2630 run : |
2731 wget https://github.com/modelica-tools/FMUComplianceChecker/releases/download/2.0.4/FMUChecker-2.0.4-linux64.zip
2832 7z x FMUChecker-2.0.4-linux64.zip && cd FMUChecker-2.0.4-linux64
29- ./fmuCheck.linux64 ../build/${{ env.MODEL_PATH }}/${{ env.MODEL_PATH }}.fmu
33+ ./fmuCheck.linux64 ../build/${{ env.MODEL_PATH }}/${{ env.MODEL_BASENAME }}.fmu
3034
3135 - name : Test
3236 run : |
@@ -51,13 +55,15 @@ jobs:
5155 - name : " Read model name"
5256 run : |
5357 echo "MODEL_PATH=$(cat build/model.txt)" | Out-File -FilePath $env:GITHUB_ENV -Append
58+ $mb = Split-Path $mp -Leaf
59+ "MODEL_BASENAME=$mb" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding UTF8
5460
5561 - name : " Download and run FMUChecker"
5662 run : |
5763 Invoke-WebRequest -Uri "https://github.com/modelica-tools/FMUComplianceChecker/releases/download/2.0.4/FMUChecker-2.0.4-win64.zip" -OutFile "FMUChecker-2.0.4-win64.zip"
5864 Expand-Archive -Path "FMUChecker-2.0.4-win64.zip" -DestinationPath "." -Force
5965 cd "FMUChecker-2.0.4-win64"
60- ./fmuCheck.win64.exe "../build/${env:MODEL_PATH}/${env:MODEL_PATH }.fmu"
66+ ./fmuCheck.win64.exe "../build/${env:MODEL_PATH}/${env:MODEL_BASENAME }.fmu"
6167
6268 - name : Test
6369 run : |
0 commit comments