Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
markaren committed Nov 7, 2024
1 parent c188339 commit d9a7ec6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
cmake --build build
- name: "Read model name"
id: read_model_name
run: |
echo "MODEL_PATH=$(cat build/model.txt)" >> $GITHUB_ENV
Expand Down Expand Up @@ -51,9 +50,8 @@ jobs:
cmake --build build --config Release
- name: "Read model name"
id: read_model_name
run: |
echo "MODEL_PATH=$(cat build/model.txt)" >> $GITHUB_ENV
echo "MODEL_PATH=$(cat build/model.txt)" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: "Download and run FMUChecker"
run: |
Expand Down
28 changes: 19 additions & 9 deletions .github/workflows/cross-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ jobs:
cmake . -B build -A x64
cmake --build build --config Release
- name: "Read model name"
id: read_model_name
- name: "Read model name (Linux)"
run: |
echo "MODEL_PATH=$(cat build/model.txt)" >> $GITHUB_ENV
if: runner.os != 'Windows'

- name: "Read model name (Windows)"
run: |
echo "MODEL_PATH=$(cat build/model.txt)" | Out-File -FilePath $env:GITHUB_ENV -Append
if: runner.os == 'Windows'

- name: "Archive library"
uses: actions/upload-artifact@v3
Expand All @@ -48,22 +53,27 @@ jobs:

steps:

- name: "Read model name"
id: read_model_name
- name: "Read model name (Linux)"
run: |
echo "MODEL_PATH=$(cat build/model.txt)" >> $GITHUB_ENV
if: runner.os != 'Windows'

- name: "Read model name (Windows)"
run: |
echo "MODEL_PATH=$(cat build/model.txt)" >> $GITHUB_ENV
echo "MODEL_PATH=$(cat build/model.txt)" | Out-File -FilePath $env:GITHUB_ENV -Append
if: runner.os == 'Windows'

- name: "Download binaries"
uses: actions/download-artifact@v3
with:
name: binaries
path: model/binaries
path: ${{ env.MODEL_PATH }}/binaries

- name: "Download modelDescription.xml"
uses: actions/download-artifact@v3
with:
name: modelDescription
path: model
path: ${{ env.MODEL_PATH }}

- name: "Set permissions"
run: |
Expand All @@ -72,5 +82,5 @@ jobs:
- name: "Upload FMU"
uses: actions/upload-artifact@v3
with:
name: model
path: model
name: ${{ env.MODEL_PATH }}
path: ${{ env.MODEL_PATH }}

0 comments on commit d9a7ec6

Please sign in to comment.