Fix build path

dynatrace-oss · Nov 2, 2023 · 24fd122 · 24fd122
1 parent 3843a7d
commit 24fd122
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml
@@ -5,4 +5,4 @@ runs:
   steps:
     - name: Build
       shell: bash
-      run: cmake --build ${{ env.CMAKE_BUILD_DIR }}
+      run: cmake --build ${{ env.BUILD_PATH }}
diff --git a/.github/actions/configure/action.yaml b/.github/actions/configure/action.yaml
@@ -8,7 +8,7 @@ runs:
       run: >-
         cmake
         -S . 
-        -B ${{ env.CMAKE_BUILD_DIR }}
+        -B ${{ env.BUILD_PATH }}
         -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} 
         -DCMAKE_C_COMPILER=gcc 
         '-DCMAKE_CXX_COMPILER=g++'

diff --git a/.github/actions/set-environment-variables/action.yaml b/.github/actions/set-environment-variables/action.yaml
@@ -14,7 +14,6 @@ runs:
       run: |
         buildType=${{ inputs.build-type }}
         printf "BUILD_TYPE=%s\n" "${buildType}" >> $GITHUB_ENV
-        printf "CMAKE_BUILD_DIR=%s\n" "cmake-build-${buildType,,}" >> $GITHUB_ENV
         
         newestVersion="$(git describe --tags --abbrev=0 --always)"
         if printf "%s" "${newestVersion}" | grep -qEv "[0-9]+\.[0-9]+\.[0-9]+"; then
@@ -25,9 +24,7 @@ runs:
         newestVersionWithTimestamp="${newestVersion}"."$(date +%Y%m%d-%H%M%S)"
         printf "ARTIFACT_VERSION=%s\n" "${newestVersionWithTimestamp}" >> $GITHUB_ENV
         
-        printf "BUILD_PATH=%s\n" "${{ github.workspace }}/${{ CMAKE_BUILD_DIR }}" >> $GITHUB_ENV
-        
-        printf "TEST_PATH=%s\n" "${{ github.workspace }}/testing" >> $GITHUB_ENV
+        printf "BUILD_PATH=%s\n" "${{ github.workspace }}/cmake-build-${buildType,,}" >> $GITHUB_ENV
         
         printf "ARTIFACT_PATH=%s\n" "${{ github.workspace }}/artifact" >> $GITHUB_ENV
         

diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml
@@ -5,4 +5,4 @@ runs:
   steps:
     - name: Test
       shell: bash
-      run: ctest --test-dir ${{ env.CMAKE_BUILD_DIR }}
+      run: ctest --test-dir ${{ env.BUILD_PATH }}