Skip to content

Commit 03269c4

Browse files
committed
<TBBAS-2595> Normalize artifact name
1 parent ed73c41 commit 03269c4

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/actions/opendaq-github-download-artifact/action.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ runs:
1818
- name: Download openDAQ artifact
1919
shell: bash
2020
run: |
21-
DEST=$(echo "${{ inputs.destination-dir }}" | sed 's|\\|/|g')
22-
ARTIFACT_DIR="$DEST/${{ inputs.opendaq-artifact-name }}"
21+
DEST="${{ inputs.destination-dir }}"
22+
DEST=$(echo "$DEST" | sed 's|\\|/|g')
2323
24-
gh run download ${{ inputs.opendaq-artifact-run-id }} \
24+
ARTIFACT_NAME="${{ inputs.opendaq-artifact-name }}"
25+
ARTIFACT_DIR="$DEST/$ARTIFACT_NAME"
26+
27+
gh run download "${{ inputs.opendaq-artifact-run-id }}" \
2528
--repo openDAQ/openDAQ \
26-
--pattern ${{ inputs.opendaq-artifact-name }} \
29+
--pattern "$ARTIFACT_NAME" \
2730
--dir "$DEST"
2831
2932
echo "$ARTIFACT_DIR/"

.github/workflows/build-tests.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,19 @@ jobs:
7474
with:
7575
opendaq-framework-package-filename: ${{ inputs.artifact-name }}/${{ inputs.file-name }}
7676

77+
- name: Set CMake generator and platform
78+
shell: bash
79+
run: |
80+
if [[ "${{ runner.os }}" == "Windows" ]]; then
81+
echo "CMAKE_GENERATOR=Visual Studio 17 2022" >> $GITHUB_ENV
82+
else
83+
echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
84+
fi
85+
7786
- name: Configure simple device module with CMake
78-
run: cmake -B build/output -S . -G "Ninja" -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
87+
shell: bash
88+
run: |
89+
cmake -B build/output -S . -G "$CMAKE_GENERATOR" -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
7990
8091
- name: Build simple device module with CMake
8192
run: cmake --build build/output --config Release

0 commit comments

Comments
 (0)