diff --git a/.github/workflows/build_binaries.json b/.github/workflows/build_binaries.json index 5363223..38509c9 100644 --- a/.github/workflows/build_binaries.json +++ b/.github/workflows/build_binaries.json @@ -18,7 +18,7 @@ { "name": "opencl-linux-arm64", "runs-on": "ubuntu-latest", - "rust": "stable", + "rust": "nightly-2024-07-07", "target": "aarch64-unknown-linux-gnu", "cross": true, "features": "opencl3", @@ -28,7 +28,7 @@ { "name": "opencl-linux-riscv64", "runs-on": "ubuntu-latest", - "rust": "stable", + "rust": "nightly-2024-07-07", "target": "riscv64gc-unknown-linux-gnu", "cross": true, "features": "opencl3", @@ -37,7 +37,7 @@ }, { "name": "opencl-macos-x86_64", - "runs-on": "macos-12", + "runs-on": "macos-13", "rust": "stable", "target": "x86_64-apple-darwin", "cross": false, diff --git a/Cargo.lock b/Cargo.lock index c01fd15..7ead07d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4567,6 +4567,40 @@ dependencies = [ "tap", ] +[[package]] +name = "glytex" +version = "0.1.13" +dependencies = [ + "anyhow", + "axum", + "clap 4.5.20", + "cust", + "libsqlite3-sys", + "log", + "log4rs", + "minotari_app_grpc", + "num-format", + "opencl-sys", + "opencl3", + "prost 0.13.3", + "prost-types 0.13.3", + "rand", + "serde", + "serde_json", + "sha3", + "tari_common", + "tari_common_types", + "tari_core", + "tari_crypto", + "tari_key_manager", + "tari_script", + "tari_shutdown", + "tari_utilities", + "thiserror", + "tokio", + "tonic", +] + [[package]] name = "yamux" version = "0.13.3" diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..f37d01d --- /dev/null +++ b/Cross.toml @@ -0,0 +1,59 @@ +[build.env] +passthrough = [ + "CFLAGS", + "TARGET", + "RUST_TARGET", + "BUILD_TARGET", + "CARGO_BUILD_TARGET", + "TARGET_CFLAGS", + "CC_aarch64_unknown_linux_gnu", + "CC_riscv64_unknown_linux_gnu", + "PKG_CONFIG_SYSROOT_DIR", + "PKG_CONFIG_ALLOW_CROSS", + "RUSTFLAGS", + "RUST_BACKTRACE", + "RUST_DEBUG", + "RUST_LOG", + "ARCH", + "FEATURES", + "ROARING_ARCH", + "TARI_NETWORK", + "TARI_TARGET_NETWORK", + "TARI_NETWORK_DIR", +] + +[target.aarch64-unknown-linux-gnu] +#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" +] + +[target.aarch64-unknown-linux-gnu.env] +passthrough = [ + "PKG_CONFIG_ALLOW_CROSS=true", +] + +[target.x86_64-unknown-linux-gnu] +#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" +] + +[target.x86_64-unknown-linux-gnu.env] +passthrough = [ + "PKG_CONFIG_ALLOW_CROSS=true", +] + +[target.riscv64gc-unknown-linux-gnu] +#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" +] + +[target.riscv64gc-unknown-linux-gnu.env] +passthrough = [ + "PKG_CONFIG_ALLOW_CROSS=true", +] diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..804a8d6 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly-2024-07-07"