From 01db1ba9a576f0a7269441f6a3e08940ff32e8b8 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Tue, 22 Nov 2022 00:52:43 +0100
Subject: [PATCH] build updates

---
 .github/workflows/build.yml | 12 +++++++++++-
 Cargo.lock                  | 24 ++++++++++++------------
 Cross.toml                  |  2 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 711d126..212dc96 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,17 @@ jobs:
         with:
           command: build
           use-cross: true
-          args: --release --target ${{ matrix.target }} -Ztarget-applies-to-host
+          args: --release --target ${{ matrix.target }}
+        env:
+          CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "--cfg tokio_unstable"
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "--cfg tokio_unstable"
+          CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS: "--cfg tokio_unstable"
+          CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS: "--cfg tokio_unstable"
+        # env:
+        #   CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-C target-feature=+crt-static --cfg tokio_unstable"
+        #   CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-C target-feature=+crt-static --cfg tokio_unstable"
+        #   CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS: "-C target-feature=+crt-static --cfg tokio_unstable"
+        #   CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS: "-C target-feature=+crt-static --cfg tokio_unstable"
 
       - name: Upload artifact
         uses: actions/upload-artifact@master
diff --git a/Cargo.lock b/Cargo.lock
index 94a2151..af416a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4647,7 +4647,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -4683,7 +4683,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-admin"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4712,7 +4712,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-common"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "anyhow",
  "argon2",
@@ -4748,7 +4748,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-core"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "anyhow",
  "argon2",
@@ -4788,7 +4788,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-database-protocols"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "bitflags",
  "bytes",
@@ -4801,7 +4801,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-db-entities"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "chrono",
  "poem-openapi",
@@ -4814,7 +4814,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-db-migrations"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "async-std",
  "chrono",
@@ -4826,7 +4826,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-protocol-http"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4858,7 +4858,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-protocol-mysql"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4885,7 +4885,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-protocol-ssh"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -4910,7 +4910,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-sso"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "bytes",
  "data-encoding",
@@ -4926,7 +4926,7 @@ dependencies = [
 
 [[package]]
 name = "warpgate-web"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "rust-embed",
  "serde",
diff --git a/Cross.toml b/Cross.toml
index 3408116..aa51dcd 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,2 +1,2 @@
 [target.x86_64-unknown-linux-gnu]
-image = "eugenepankov/warpgate-build-env"
+pre-build = ["apt-get update && apt-get install --assume-yes libz-dev"]