Extract smartmontools before running cmake.

ashaduri · May 29, 2024 · 9b1bc82 · 9b1bc82
1 parent d1f0b51
commit 9b1bc82
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 48 deletions.
diff --git a/.github/workflows/cmake-tier1.yml b/.github/workflows/cmake-tier1.yml
@@ -94,30 +94,6 @@ jobs:
             make
             p7zip
 
-      - name: List installed files
-        shell: msys2 {0}
-        run: |
-          ls -1R /mingw64
-          ls -1R /mingw32
-
-      - name: Configure CMake
-        shell: msys2 {0}
-        run: >
-          cmake -B build -S "$GITHUB_WORKSPACE"
-          -G "MSYS Makefiles"
-          -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-          -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/toolchains/${{ matrix.platform }}-mingw-msys2.cmake"
-
-      - name: Build
-        shell: msys2 {0}
-        working-directory: ${{github.workspace}}/build
-        run: cmake --build . --config $BUILD_TYPE
-
-      - name: Test
-        working-directory: ${{github.workspace}}/build
-        shell: msys2 {0}
-        run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
-
       - name: Download Package Requirements
         shell: msys2 {0}
         working-directory: ${{github.workspace}}/build
@@ -148,11 +124,35 @@ jobs:
           bin/update-smart-drivedb.ps1
           bin/drivedb.h
 
+      - name: List installed files
+        shell: msys2 {0}
+        run: |
+          ls -1R /mingw64
+          ls -1R /mingw32
+
       - name: List Files in Workspace
         shell: msys2 {0}
         working-directory: ${{github.workspace}}
         run: ls -1R .
 
+      - name: Configure CMake
+        shell: msys2 {0}
+        run: >
+          cmake -B build -S "$GITHUB_WORKSPACE"
+          -G "MSYS Makefiles"
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+          -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/toolchains/${{ matrix.platform }}-mingw-msys2.cmake"
+
+      - name: Build
+        shell: msys2 {0}
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        shell: msys2 {0}
+        run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
+
       - name: Package ZIP
         shell: msys2 {0}
         working-directory: ${{github.workspace}}/build

diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml
@@ -41,30 +41,6 @@ jobs:
             make
             p7zip
 
-      - name: List installed files
-        shell: msys2 {0}
-        run: |
-          ls -1R /mingw64
-          ls -1R /mingw32
-
-      - name: Configure CMake
-        shell: msys2 {0}
-        run: >
-          cmake -B build -S "$GITHUB_WORKSPACE"
-          -G "MSYS Makefiles"
-          -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-          -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/toolchains/${{ matrix.platform }}-mingw-msys2.cmake"
-
-      - name: Build
-        shell: msys2 {0}
-        working-directory: ${{github.workspace}}/build
-        run: cmake --build . --config $BUILD_TYPE
-
-      - name: Test
-        working-directory: ${{github.workspace}}/build
-        shell: msys2 {0}
-        run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
-
       - name: Download Package Requirements
         shell: msys2 {0}
         working-directory: ${{github.workspace}}/build
@@ -95,6 +71,30 @@ jobs:
           bin/update-smart-drivedb.ps1
           bin/drivedb.h
 
+      - name: List installed files
+        shell: msys2 {0}
+        run: |
+          ls -1R /mingw64
+          ls -1R /mingw32
+
+      - name: Configure CMake
+        shell: msys2 {0}
+        run: >
+          cmake -B build -S "$GITHUB_WORKSPACE"
+          -G "MSYS Makefiles"
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+          -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/toolchains/${{ matrix.platform }}-mingw-msys2.cmake"
+
+      - name: Build
+        shell: msys2 {0}
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        shell: msys2 {0}
+        run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
+
       - name: Package ZIP
         shell: msys2 {0}
         working-directory: ${{github.workspace}}/build