Optimize CI run

.cirrus.yml

@@ -62,6 +62,7 @@ task:
 task:
   name: package_source
   only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BRANCH =~ 'release/.*' || $CIRRUS_PR != ''
+  skip: "!changesInclude('.cirrus.yml') && changesIncludeOnly('/*.sh', '/.*', '/_*', 'Brewfile', 'docs/**', '**.adoc', '**.md', '**.nix', 'flake.lock', '.github/**') || $CIRRUS_CHANGE_MESSAGE =~ '.*skip ci.*'"
   env:
     CIRRUS_CLONE_SUBMODULES: true
 
@@ -89,6 +90,7 @@ task:
   name: package_binary
   depends_on: [ package_source ]
   only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BRANCH =~ 'release/.*' || $CIRRUS_PR != ''
+  skip: "!changesInclude('.cirrus.yml') && changesIncludeOnly('/*.sh', '/.*', '/_*', 'Brewfile', 'docs/**', '**.adoc', '**.md', '**.nix', 'flake.lock', '.github/**') || $CIRRUS_CHANGE_MESSAGE =~ '.*skip ci.*'"
 
   clone_script: |
     echo "Not cloning rnp repo"
@@ -125,6 +127,7 @@ task:
   name: test_binary
   depends_on: [ package_binary ]
   only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BRANCH =~ 'release/.*' || $CIRRUS_PR != ''
+  skip: "!changesInclude('.cirrus.yml') && changesIncludeOnly('/*.sh', '/.*', '/_*', 'Brewfile', 'docs/**', '**.adoc', '**.md', '**.nix', 'flake.lock', '.github/**') || $CIRRUS_CHANGE_MESSAGE =~ '.*skip ci.*'"
 
   clone_script: |
     echo "Not cloning rnp repo"

.github/workflows/windows-msys2.yml

@@ -101,6 +101,7 @@ jobs:
             cmake:p
             libbotan:p
             json-c:p
+            asciidoctor:p
             gtest:p
           path-type: minimal
 

CMakeLists.txt

@@ -128,22 +128,10 @@ if(NOT MSVC)
   )
 endif(NOT MSVC)
 
-# MSYS-specific options
-if(MSYS)
-  add_compile_options(
-    -fstack-protector
-    -fopenmp
-  )
-  link_libraries(
-    -fstack-protector
-    -fopenmp
-  )
-endif(MSYS)
-
 # THis works both for MSVC and CL on Windows
-if(WIN32 AND NOT MSYS)
+if(WIN32)
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
-endif(WIN32 AND NOT MSYS)
+endif(WIN32)
 
 # set a few other things at the top level to prevent incompatibilities
 set(CMAKE_C_STANDARD 99)

src/rnp/CMakeLists.txt

@@ -87,10 +87,6 @@ if(MSVC)
     )
 endif(MSVC)
 
-if(MSYS)
-  target_link_libraries(rnp PRIVATE regex)
-endif(MSYS)
-
 include(GNUInstallDirs)
 install(TARGETS rnp
   RUNTIME

src/rnpkeys/CMakeLists.txt

@@ -88,10 +88,6 @@ if(MSVC)
     )
 endif()
 
-if(MSYS)
-  target_link_libraries(rnpkeys PRIVATE regex)
-endif(MSYS)
-
 include(GNUInstallDirs)
 install(TARGETS rnpkeys
   RUNTIME

src/tests/CMakeLists.txt

@@ -183,10 +183,6 @@ if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl")
   target_link_libraries(rnp_tests PRIVATE OpenSSL::Crypto)
 endif()
 
-if(MSYS)
-  target_link_libraries(rnp_tests PRIVATE regex)
-endif(MSYS)
-
 target_compile_definitions(rnp_tests
   PRIVATE
     RNP_RUN_TESTS