diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f86fca5..15a4bba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,8 +48,8 @@ jobs: matrix: job: - { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true } - - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true } - - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true } + # - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true } + # - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true } - { target: i686-pc-windows-msvc , os: windows-2019 } - { target: i686-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true } - { target: i686-unknown-linux-musl , os: ubuntu-20.04, use-cross: true } @@ -159,7 +159,7 @@ jobs: echo "ASSET_PATH=${PKG_STAGING}/${PKG_NAME}" | tee -a $GITHUB_ENV echo "ASSET_SUM=${PKG_STAGING}/${PKG_NAME}.sha256" | tee -a $GITHUB_ENV - - name: Upload release archive - env: - GH_TOKEN: ${{ github.token }} - run: gh release upload ${{ needs.get-release.outputs.smartcat_version }} ${{ env.ASSET_PATH }} ${{ env.ASSET_SUM }} + # - name: Upload release archive + # env: + # GH_TOKEN: ${{ github.token }} + # run: gh release upload ${{ needs.get-release.outputs.smartcat_version }} ${{ env.ASSET_PATH }} ${{ env.ASSET_SUM }} diff --git a/Cargo.lock b/Cargo.lock index aed47a7..44c7202 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -778,6 +778,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.102" @@ -786,6 +795,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -1189,6 +1199,7 @@ dependencies = [ "env_logger", "glob", "log", + "openssl", "reqwest", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index ff18078..5c5c6fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,3 +49,28 @@ extended-description = """\ Putting a brain behind `cat`. CLI interface to bring language models in the Unix ecosystem 🐈‍⬛ """ + +# [workspace.metadata.cross.target.aarch64-unknown-linux-gnu] +# # Install libssl-dev:arm64, see +# pre-build = [ +# "dpkg --add-architecture $CROSS_DEB_ARCH", +# "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +# ] +# [workspace.metadata.cross.target.x86_64-unknown-linux-gnu] +# # Install libssl-dev:arm64, see +# pre-build = [ +# "dpkg --add-architecture $CROSS_DEB_ARCH", +# "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +# ] +# [workspace.metadata.cross.target.aarch64-unknown-linux-musl] +# # Install libssl-dev:arm64, see +# pre-build = [ +# "dpkg --add-architecture $CROSS_DEB_ARCH", +# "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +# ] +# [workspace.metadata.cross.target.x86_64-unknown-linux-musl] +# # Install libssl-dev:arm64, see +# pre-build = [ +# "dpkg --add-architecture $CROSS_DEB_ARCH", +# "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +# ] diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..2fd39ee --- /dev/null +++ b/Cross.toml @@ -0,0 +1,24 @@ +[target.aarch64-unknown-linux-gnu] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +] + +[target.x86_64-unknown-linux-gnu] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +] + +[target.aarch64-unknown-linux-musl] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +] + +[target.x86_64-unknown-linux-musl] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libx11" +] +