github-actions: fixed a installation failure on Windows

IntersectMBO · Nov 4, 2022 · c332655 · c332655
1 parent 0b754ef
commit c332655
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,6 +41,7 @@ jobs:
           mingw-w64-x86_64-toolchain
           mingw-w64-x86_64-libsodium
           mingw-w64-x86_64-jq
+          mingw-w64-x86_64-openssl
 
     - name: "WIN: Setup pkg-config"
       if: runner.os == 'Windows'
@@ -125,27 +126,14 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: "Configure cabal.project.local"
+      if: runner.os != 'Windows'
       run: |
-        # running cabal configure overrides every other configuration already
-        # present in the cabal.project.local file so it is quite disruptive. By
-        # manually adding the options we want, this is always consistent.
-        cat ./cabal.project.local.ci >> ./cabal.project.local
-
-        cat >> cabal.project.local <<EOF
-
-        -- Add strcittvar check
-        package io-classes
-          flags: +checktvarinvariant
-
-        package cardano-crypto-praos
-          flags: -external-libsodium-vrf
+        cp .github/workflows/cabal.project.local.Linux cabal.project.local
 
-        -- cabal configure --enable-tests
-        ignore-project: False
-        tests: True
-        EOF
-
-        cat ./cabal.project.local
+    - name: "Configure cabal.project.local Windows"
+      if: runner.os == 'Windows'
+      run: |
+        cp .github/workflows/cabal.project.local.Windows cabal.project.local
 
     - name: Record dependencies
       id: record-deps

diff --git a/cabal.project.local.ci → .github/workflows/cabal.project.local.Linux b/cabal.project.local.ci → .github/workflows/cabal.project.local.Linux
@@ -1,5 +1,7 @@
 max-backjumps: 5000
 reorder-goals: True
+ignore-project: False
+tests: True
 
 package Win32-network
   ghc-options: -Werror
@@ -9,14 +11,14 @@ package ntp-client
   ghc-options: -Werror
   flags: +demo
 
-package io-sim-classes
-  ghc-options: -Werror
-  flags: +asserts
-
 package io-sim
   ghc-options: -Werror
   flags: +asserts
 
+-- Add strcittvar check
+package io-classes
+  flags: +checktvarinvariant
+
 package monoidal-synchronisation
   ghc-options: -Werror
 
@@ -43,3 +45,6 @@ package ouroboros-network
 
 package cardano-client
   ghc-options: -Werror
+
+package cardano-crypto-praos
+  flags: -external-libsodium-vrf