Update CI

complexlogic · Feb 25, 2024 · 0217607 · 0217607
1 parent 1424856
commit 0217607
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,54 +27,21 @@ permissions:
 defaults:
   run:
     shell: bash
-
 env:
-  VCPKG_COMMITTISH: c8696863d371ab7f46e213d8f5ca923c4aef2a00
+  VCPKG_COMMITTISH: 37c3e63a1306562f7f59c4c3c8892ddd50fdf992
 
 jobs:
   build_windows:
     name: Windows
     runs-on: windows-2022
     strategy:
       fail-fast: false
-
     env:
       CMAKE_BUILD_TYPE: Release
       CMAKE_GENERATOR: Visual Studio 17 2022
       VCPKG_TRIPLET: custom-triplet
 
     steps:
-      - name: Remove Old VS version (Hack)
-        shell: pwsh
-        run: |
-          Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
-          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-          $componentsToRemove= @(
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre"
-          )
-          [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " +  $_}
-          $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
-          # should be run twice
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-          $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-
       - name: Checkout Git repository
         uses: actions/checkout@v3
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ project(rsgain
 set(MAXPROGBARWIDTH "0" CACHE STRING "Maximum width of progress bar")
 option(UCHECKMARKS "Enable use of Unicode checkmarks" ON)
 option(EXTRA_WARNINGS "Enable extra compiler warnings" OFF)
-option(INSTALL_MANPAGE "Install man page" OFF)
+option(INSTALL_MANPAGE "Install man page (requires gzip)" OFF)
 if (EXTRA_WARNINGS)
   if (MSVC)
     add_compile_options(/W4 /WX)

diff --git a/docs/rsgain.1 b/docs/rsgain.1
@@ -165,7 +165,7 @@ Output with sep header (needed for Microsoft Excel compatibility)\.
 \fB\-O a\fR, \fB\-\-output=a\fR
 Output with files sorted in alphanumeric order\.
 .TP
-\fB\-p\fR, \fB\-\-preserve_mtimes\fR
+\fB\-p\fR, \fB\-\-preserve-mtimes\fR
 Preserve file mtimes\.
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -65,7 +65,7 @@ elseif (UNIX)
     add_custom_command(TARGET ${EXECUTABLE_TITLE}
       POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/docs/${EXECUTABLE_TITLE}.1" "${PROJECT_BINARY_DIR}"
-      COMMAND "${GZIP}" "${PROJECT_BINARY_DIR}/${EXECUTABLE_TITLE}.1"
+      COMMAND "${GZIP}" -f "${PROJECT_BINARY_DIR}/${EXECUTABLE_TITLE}.1"
     )
   endif ()
 endif()