Better directory name, build all modules.

michaelonken · Jan 5, 2024 · 5af0d9e · 5af0d9e
1 parent ef75ea1
commit 5af0d9e
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/.github/workflows/cmake-win.yml b/.github/workflows/cmake-win.yml
@@ -50,14 +50,17 @@ jobs:
       - name: Configure project
 
         run: |
+          $NOW=& Get-Date -format yyyy-MM-dd
+          echo "NOW=$NOW" >> $env:GITHUB_ENV
+
           ls ${{ github.workspace }}
           echo "WORKSPACE dir: ${{ github.workspace }}"
           cmake --version
           mkdir ${{ github.workspace }}\dcmtk-build
           echo "Step 2"
           cd ${{ github.workspace }}\dcmtk-build
           echo "Step 3"
-          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 }}
+          cmake -G "Visual Studio 17 2022" -Ax64 -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-install  ${{ github.workspace }}
 
       - name: Build dcmtk
         run: |
@@ -69,23 +72,18 @@ jobs:
           cd ${{ github.workspace }}\dcmtk-build
           ctest -VV -C Release --no-compress-output
 
-      - name: Put current date into a variable
-        run: |
-          $NOW=& Get-Date -format yyyy-MM-dd
-          echo "NOW=$NOW" >> $env:GITHUB_ENV
-
       - name: Install dcmtk
         run: |
           cd ${{ github.workspace }}\dcmtk-build
           cmake --build . --config Release --target INSTALL -- /m
-          Compress-Archive -Path ${{ github.workspace }}\dcmtk-install -Destination ${{ github.workspace }}\dcmtk-install\dcmtk-${{ env.NOW }}-win64.zip
-          echo "Listing install dir: ${{ github.workspace }}\dcmtk-install"
+          Compress-Archive -Path ${{ github.workspace }}\dcmtk-${{ env.NOW }} -Destination ${{ github.workspace }}\dcmtk-${{ env.NOW }}\dcmtk-${{ env.NOW }}-win64.zip
+          echo "Listing install dir: ${{ github.workspace }}\dcmtk-${{ env.NOW }}"
           ls ${{ github.workspace }}\dcmtk-install
 
       - uses: actions/upload-artifact@v3
         with:
             name: dcmtk-install-zip-package
-            path: ${{ github.workspace }}\dcmtk-install\dcmtk-*-win64.zip
+            path: ${{ github.workspace }}\dcmtk-${{ env.NOW }}\dcmtk-*-win64.zip
 
   publish-windows: