ci: link openssl static

deepeth · Aug 5, 2022 · 675625a · 675625a
1 parent 4b8ed96
commit 675625a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -90,8 +90,8 @@ jobs:
           mkdir -p release/${target}/{bin,schemas,configs}
           cp ./target/${target}/release/ethetl release/${target}/bin/
           rm -f release/${target}/bin/*.d
-          cp -r ./schemas release/${target}/schemas
-          cp -r ./scripts/deploy release/${target}/configs
+          cp -r ./schemas/* release/${target}/schemas/
+          cp -r ./scripts/deploy/* release/${target}/configs/
           gtar -C ./release/${target} -czvf ethetl-${version}-${target}.tar.gz bin schemas configs
       - name: update release to github
         shell: bash
@@ -135,8 +135,8 @@ jobs:
           mkdir -p release/${target}/{bin,schemas,configs}
           cp ./target/${target}/release/ethetl release/${target}/bin/
           rm -f release/${target}/bin/*.d
-          cp -r ./schemas release/${target}/schemas
-          cp -r ./scripts/deploy release/${target}/configs
+          cp -r ./schemas/* release/${target}/schemas/
+          cp -r ./scripts/deploy/* release/${target}/configs/
           tar -C ./release/${target} -czvf ethetl-${version}-${target}.tar.gz bin schemas configs
       - name: update release to github
         shell: bash

diff --git a/Cross.toml b/Cross.toml
@@ -12,10 +12,11 @@ passthrough = [
 ]
 
 [target.aarch64-unknown-linux-gnu]
-pre-build = ["dpkg --add-architecture arm64 && apt-get update && apt-get install -y libssl-dev libssl-dev:arm64"]
+dockerfile = "./docker/cross/Dockerfile.aarch64-unknown-linux-gnu"
 
 [target.x86_64-unknown-linux-gnu]
 pre-build = ["apt-get update && apt-get install -y libssl-dev"]
+dockerfile = "./docker/cross/Dockerfile.x86_64-unknown-linux-gnu"
 
 [target.aarch64-unknown-linux-musl]
 dockerfile = "./docker/cross/Dockerfile.aarch64-unknown-linux-musl"

diff --git a/docker/cross/Dockerfile.aarch64-unknown-linux-gnu b/docker/cross/Dockerfile.aarch64-unknown-linux-gnu
@@ -0,0 +1,8 @@
+FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main
+
+COPY docker/cross/openssl.sh /
+RUN bash /openssl.sh linux-aarch64 aarch64-linux-gnu-
+ENV OPENSSL_DIR=/openssl \
+    OPENSSL_INCLUDE_DIR=/openssl/include \
+    OPENSSL_LIB_DIR=/openssl/lib \
+    OPENSSL_STATIC=1
diff --git a/docker/cross/Dockerfile.x86_64-unknown-linux-gnu b/docker/cross/Dockerfile.x86_64-unknown-linux-gnu
@@ -0,0 +1,8 @@
+FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main
+
+COPY docker/cross/openssl.sh /
+RUN bash /openssl.sh linux-x86_64 x86_64-linux-gnu-
+ENV OPENSSL_DIR=/openssl \
+    OPENSSL_INCLUDE_DIR=/openssl/include \
+    OPENSSL_LIB_DIR=/openssl/lib \
+    OPENSSL_STATIC=1