fixups Enable testing in windows

esl · Nov 20, 2023 · 228d912 · 228d912
1 parent 8c931ba
commit 228d912
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,9 +36,15 @@ jobs:
         with:
           path: ~/.cache/rebar3
           key: rebar3-cache-for-os-${{matrix.os}}-otp-${{matrix.otp}}-rebar3-${{matrix.rebar3}}-hash-${{hashFiles('rebar.lock')}}
+
       - name: Enable Developer Command Prompt
         uses: ilammy/[email protected]
         if: ${{ matrix.os == 'windows-2022' }}
+      - name: Install openssl
+        shell: cmd
+        run: |
+          choco install openssl
+          IF EXIST "c:\\Program Files\\OpenSSL-Win64" (move "c:\\Program Files\\OpenSSL-Win64" "c:\\OpenSSL-Win64") ELSE (move "c:\\Program Files\\OpenSSL" "c:\\OpenSSL-Win64")
 
       - run: rebar3 as test get-deps
       - run: rebar3 as test compile

diff --git a/rebar.config b/rebar.config
@@ -19,7 +19,7 @@
                "$CFLAGS -std=c99 -O0 -g -Wall -Wextra -fPIC --coverage"},
           {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
                "$LDLIBS -lcrypto --coverage"},
-          {"win32", "CFLAGS", "$CFLAGS /O0 /DNDEBUG /Wall"},
+          {"win32", "CFLAGS", "$CFLAGS /I${OPENSSL_INSTALL_DIR}/include /O2 /DNDEBUG /Wall"},
           {"win32", "LDLIBS", "$LDLIBS libcrypto.lib"}
         ]
       }
@@ -35,7 +35,7 @@
          "CFLAGS", "$CFLAGS -std=c99 -O3 -g -Wall -Wextra -fPIC"},
     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
          "LDLIBS", "$LDLIBS -lcrypto"},
-    {"win32", "CFLAGS", "$CFLAGS /O2 /DNDEBUG /Wall"},
+    {"win32", "CFLAGS", "$CFLAGS /I${OPENSSL_INSTALL_DIR}/include /O2 /DNDEBUG /Wall"},
     {"win32", "LDLIBS", "$LDLIBS libcrypto.lib"},
     {"DRV_LINK_TEMPLATE", "$DRV_LINK_TEMPLATE $LDLIBS"}
   ]