Bunch of randomx changes

leet4tari · Nov 22, 2024 · 837a769 · 837a769
1 parent 878c71b
commit 837a769
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml
@@ -238,6 +238,12 @@ jobs:
           echo "Debugging ..."
           set open
 
+      - name: Set Perl environment variables
+        if: runner.os == 'Windows'
+        run: |
+          echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+
       - name: Set environment variables - Nix
         if: ${{ ! startsWith(runner.os,'Windows') }}
         shell: bash
@@ -287,12 +293,12 @@ jobs:
           echo "TS_DIST=\dist" >> $GITHUB_ENV
           echo "PLATFORM_SPECIFIC_DIR=windows" >> $GITHUB_ENV
           echo "SQLITE3_LIB_DIR=C:\vcpkg\installed\x64-windows\lib" >> $GITHUB_ENV
-          echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
-          echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
-          echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
-          echo "OPENSSL_DIR=C:\vcpkg\packages\openssl_x64-windows-static" >> $GITHUB_ENV
-          echo "OPENSSL_STATIC=Yes" >> $GITHUB_ENV
-          echo "VCPKGRS_DYNAMIC=1" >> $GITHUB_ENV
+          #echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
+          #echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
+          #echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
+          #echo "OPENSSL_DIR=C:\vcpkg\packages\openssl_x64-windows-static" >> $GITHUB_ENV
+          #echo "OPENSSL_STATIC=Yes" >> $GITHUB_ENV
+          #echo "VCPKGRS_DYNAMIC=1" >> $GITHUB_ENV
 
       - name: Cache cargo files and outputs
         if: ${{ ( ! startsWith(github.ref, 'refs/tags/v') ) && ( ! matrix.builds.cross ) && ( env.CARGO_CACHE ) }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -95,7 +95,7 @@ tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
 dirs-next = "1.0.2"
 hickory-client = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dnssec-openssl"] }
 anyhow = "1.0.53"
-openssl = { version = "0.10.66", features = ["vendored"] }
+#openssl = { version = "0.10.66", features = ["vendored"] }
 
 [dev-dependencies]
 criterion = { version = "0.4.0" }