diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index d505e66..0af8a75 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -200,13 +200,20 @@ jobs: echo "SHARUN=pwsh $GITHUB_WORKSPACE\psutils\shasum.ps1 --algorithm 256" >> $GITHUB_ENV # vcpkg.exe install sqlite3:x64-windows zlib:x64-windows # Bug in choco - need to install each package individually - choco upgrade llvm -y + #choco upgrade llvm -y choco upgrade protoc -y - choco install openssl -y + # openssl install stupidness + #choco install openssl -y + #echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV # choco upgrade opencl-intel-cpu-runtime -y vcpkg.exe --triplet=x64-windows install opencl - # openssl install stupidness - echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV + # Needed for openssl via vcpkg + vcpkg install openssl:x64-windows-static + echo "VCPKG_ROOT=C:\vcpkg" >> $GITHUB_ENV + echo "OPENSSL_DIR=C:\vcpkg\packages\openssl_x64-windows-static" >> $GITHUB_ENV + #echo "OPENSSL_STATIC=Yes" >> $GITHUB_ENV + #echo "VCPKGRS_DYNAMIC=1" >> $GITHUB_ENV + rustup target add ${{ matrix.builds.target }} - name: Install and setup cargo cross if: ${{ matrix.builds.cross }} @@ -254,7 +261,7 @@ jobs: ${{ matrix.builds.flags }} \ --bin ${{ env.TS_FILENAME }} - - name: Build release binaries + - name: Build release binaries (info) if: ${{ false }} shell: bash run: | diff --git a/Cargo.toml b/Cargo.toml index e0b7d91..8d14d0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] -edition = "2021" name = "xtrgpuminer" version = "0.2.7" +edition = "2021" [dependencies] anyhow = "*" diff --git a/Cross.toml b/Cross.toml index f37d01d..1bb985b 100644 --- a/Cross.toml +++ b/Cross.toml @@ -26,7 +26,7 @@ passthrough = [ #image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"] pre-build = [ "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH" + "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" ] [target.aarch64-unknown-linux-gnu.env] @@ -38,7 +38,7 @@ passthrough = [ #image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"] pre-build = [ "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH" + "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" ] [target.x86_64-unknown-linux-gnu.env] @@ -50,7 +50,7 @@ passthrough = [ #image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu", "linux/riscv64=riscv64gc-unknown-linux-gnu"] pre-build = [ "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get --assume-yes install libprotobuf-dev protobuf-compiler opencl-headers ocl-icd-opencl-dev:$CROSS_DEB_ARCH" + "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" ] [target.riscv64gc-unknown-linux-gnu.env]