Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 2af79db

Browse files
authored
chore(ci): fix build for openssl dependency (#26)
Fix build for openssl dependency
1 parent 94c958d commit 2af79db

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

.github/workflows/build_binaries.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,20 @@ jobs:
200200
echo "SHARUN=pwsh $GITHUB_WORKSPACE\psutils\shasum.ps1 --algorithm 256" >> $GITHUB_ENV
201201
# vcpkg.exe install sqlite3:x64-windows zlib:x64-windows
202202
# Bug in choco - need to install each package individually
203-
choco upgrade llvm -y
203+
#choco upgrade llvm -y
204204
choco upgrade protoc -y
205-
choco install openssl -y
205+
# openssl install stupidness
206+
#choco install openssl -y
207+
#echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
206208
# choco upgrade opencl-intel-cpu-runtime -y
207209
vcpkg.exe --triplet=x64-windows install opencl
208-
# openssl install stupidness
209-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
210+
# Needed for openssl via vcpkg
211+
vcpkg install openssl:x64-windows-static
212+
echo "VCPKG_ROOT=C:\vcpkg" >> $GITHUB_ENV
213+
echo "OPENSSL_DIR=C:\vcpkg\packages\openssl_x64-windows-static" >> $GITHUB_ENV
214+
#echo "OPENSSL_STATIC=Yes" >> $GITHUB_ENV
215+
#echo "VCPKGRS_DYNAMIC=1" >> $GITHUB_ENV
216+
rustup target add ${{ matrix.builds.target }}
210217
211218
- name: Install and setup cargo cross
212219
if: ${{ matrix.builds.cross }}
@@ -254,7 +261,7 @@ jobs:
254261
${{ matrix.builds.flags }} \
255262
--bin ${{ env.TS_FILENAME }}
256263
257-
- name: Build release binaries
264+
- name: Build release binaries (info)
258265
if: ${{ false }}
259266
shell: bash
260267
run: |

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
2-
edition = "2021"
32
name = "xtrgpuminer"
43
version = "0.2.7"
4+
edition = "2021"
55

66
[dependencies]
77
anyhow = "*"

Cross.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ passthrough = [
2626
#image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"]
2727
pre-build = [
2828
"dpkg --add-architecture $CROSS_DEB_ARCH",
29-
"apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH"
29+
"apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH"
3030
]
3131

3232
[target.aarch64-unknown-linux-gnu.env]
@@ -38,7 +38,7 @@ passthrough = [
3838
#image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"]
3939
pre-build = [
4040
"dpkg --add-architecture $CROSS_DEB_ARCH",
41-
"apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH"
41+
"apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH"
4242
]
4343

4444
[target.x86_64-unknown-linux-gnu.env]
@@ -50,7 +50,7 @@ passthrough = [
5050
#image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu", "linux/riscv64=riscv64gc-unknown-linux-gnu"]
5151
pre-build = [
5252
"dpkg --add-architecture $CROSS_DEB_ARCH",
53-
"apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH"
53+
"apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH"
5454
]
5555

5656
[target.riscv64gc-unknown-linux-gnu.env]

0 commit comments

Comments
 (0)