Different compression tool, less modules.

michaelonken · Jan 5, 2024 · 9c474d6 · 9c474d6
1 parent d3884f4
commit 9c474d6
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/.github/workflows/cmake-win.yml b/.github/workflows/cmake-win.yml
@@ -57,7 +57,7 @@ jobs:
           echo "Step 2"
           cd ${{ github.workspace }}\dcmtk-build
           echo "Step 3"
-          cmake -G "Visual Studio 17 2022" -Ax64 -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-install  ${{ github.workspace }}
+          cmake -G "Visual Studio 17 2022" -Ax64 -DDCMTK_MODULES:STRING="ofstd;oflog;oficonv;dcmdata" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-install  ${{ github.workspace }}
 
       - name: Build dcmtk
         run: |
@@ -69,24 +69,21 @@ jobs:
           cd ${{ github.workspace }}\dcmtk-build
           ctest -VV -C Release --no-compress-output
 
-      - name: Install dcmtk
-        run: |
-          cd ${{ github.workspace }}\dcmtk-build
-          cmake --build . --config Release --target INSTALL -- /m
-
       - name: Put current date into a variable
         run: |
           $NOW=& Get-Date -format yyyy-MM-dd
           echo "NOW=$NOW" >> $env:GITHUB_ENV
 
-      - uses: edgarrc/action-7z@v1
-        with:
-          args: 7z a ${{ github.workspace }}\dcmtk-build\dcmtk-install\dcmtk-build\dcmtk-${{ env.NOW }}-win64.zip ${{ github.workspace }}\dcmtk-install\*
+      - name: Install dcmtk
+        run: |
+          cd ${{ github.workspace }}\dcmtk-build
+          cmake --build . --config Release --target INSTALL -- /m
+          Compress-Archive -Path ${{ github.workspace }}\dcmtk-build\dcmtk-install -Destination ${{ github.workspace }}\dcmtk-build\dcmtk-install\dcmtk-${{ env.NOW }}-win64.zip
 
       - uses: actions/upload-artifact@v3
         with:
             name: dcmtk-build
-            path: ${{ github.workspace }}\dcmtk-build\dcmtk-install\dcmtk-*-win64*.zip
+            path: ${{ github.workspace }}\dcmtk-build\dcmtk-install\dcmtk-*-win64.zip
 
   publish-windows: