From 6649b2786915c0fbf273cf2f0c8d9763bc7bbdc3 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Thu, 22 Apr 2021 23:26:30 +0530 Subject: [PATCH] many changes re-enable cross and os-matrix cross remove jsonwebtoken since it doesn't compile on ppc improve docker build and make it publish to docker.io --- .github/workflows/ci.yml | 32 +++++++---- Cargo.lock | 116 ++------------------------------------- Cargo.toml | 7 ++- src/main.rs | 2 - 4 files changed, 33 insertions(+), 124 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82017ce..48973ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,14 +84,15 @@ jobs: build: name: Build Binaries + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) runs-on: ubuntu-latest needs: [check, test, lints] - # strategy: - # matrix: - # target: - # - x86_64-unknown-linux-gnu - # # - aarch64-unknown-linux-gnu - # # - powerpc64-unknown-linux-gnu + strategy: + matrix: + target: + - x86_64-unknown-linux-gnu + - aarch64-unknown-linux-gnu + - powerpc64-unknown-linux-gnu steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 @@ -101,13 +102,16 @@ jobs: override: true - name: Rust Cache uses: Swatinem/rust-cache@v1.2.0 - - uses: actions-rs/cargo@v1 + - name: Compile + uses: actions-rs/cargo@v1 with: + use-cross: true command: build - args: --release --target=x86_64-unknown-linux-gnu + args: --release --target=${{ matrix.target }} - build-docker: - name: Build Docker Image + publish-docker: + name: Build and Publish Docker Image + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) runs-on: ubuntu-latest needs: [check, test, lints] steps: @@ -115,5 +119,13 @@ jobs: - name: Docker layer cache uses: satackey/action-docker-layer-caching@v0.0.11 continue-on-error: true + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: rohansircar + password: ${{ secrets.DOCKER_LOGIN_PASSWORD }} - name: Build Image run: docker build -t rohansircar/actix-demo:latest . + - name: Publish Image + uses: elgohr/Publish-Docker-Github-Action@master + run: docker push rohansircar/actix-demo:latest \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index d294d24..e75162b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,7 +57,6 @@ dependencies = [ "env_logger", "futures", "json", - "jsonwebtoken", "lazy-regex", "lazy_static", "listenfd", @@ -107,7 +106,7 @@ dependencies = [ "actix-service 1.0.6", "actix-threadpool", "actix-utils", - "base64 0.13.0", + "base64", "bitflags", "brotli2", "bytes 0.5.6", @@ -353,7 +352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3b11a07a3df3f7970fd8bd38cc66998b5549f507c54cc64c6e843bc82d6358" dependencies = [ "actix-web", - "base64 0.13.0", + "base64", "futures-util", ] @@ -470,7 +469,7 @@ dependencies = [ "actix-http", "actix-rt", "actix-service 1.0.6", - "base64 0.13.0", + "base64", "bytes 0.5.6", "cfg-if 1.0.0", "derive_more", @@ -490,12 +489,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -508,7 +501,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4d0faafe9e089674fc3efdb311ff5253d445c79d85d1d28bd3ace76d45e7164" dependencies = [ - "base64 0.13.0", + "base64", "blowfish", "getrandom 0.2.2", ] @@ -676,7 +669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "aes-gcm", - "base64 0.13.0", + "base64", "hkdf", "hmac", "percent-encoding", @@ -1232,35 +1225,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -[[package]] -name = "js-sys" -version = "0.3.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "json" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" -[[package]] -name = "jsonwebtoken" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" -dependencies = [ - "base64 0.12.3", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -1490,17 +1460,6 @@ dependencies = [ "version_check 0.1.5", ] -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg 1.0.1", - "num-integer", - "num-traits", -] - [[package]] name = "num-integer" version = "0.1.44" @@ -1530,12 +1489,6 @@ dependencies = [ "libc", ] -[[package]] -name = "once_cell" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -1573,17 +1526,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" -[[package]] -name = "pem" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" -dependencies = [ - "base64 0.13.0", - "once_cell", - "regex", -] - [[package]] name = "percent-encoding" version = "2.1.0" @@ -2012,21 +1954,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "rusqlite" version = "0.23.1" @@ -2172,17 +2099,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simple_asn1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" -dependencies = [ - "chrono", - "num-bigint", - "num-traits", -] - [[package]] name = "siphasher" version = "0.2.3" @@ -2212,12 +2128,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "standback" version = "0.2.17" @@ -2564,12 +2474,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "2.2.1" @@ -2755,16 +2659,6 @@ version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" -[[package]] -name = "web-sys" -version = "0.3.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "widestring" version = "0.4.3" diff --git a/Cargo.toml b/Cargo.toml index 0f258cb..d5515d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ dotenv = "0.15.0" r2d2 = "0.8.9" validator = "0.13.0" validator_derive = "0.13.0" -jsonwebtoken = "7.2.0" +# jsonwebtoken = "7.2.0" actix-identity = "0.3.1" actix-web-httpauth = "0.5.1" rand = "0.8.3" @@ -70,3 +70,8 @@ features = ['serde'] # version = '0.9.0' # default-features = false # features = ['config'] + +[build.env] +passthrough = [ + "RUST_BACKTRACE", +] diff --git a/src/main.rs b/src/main.rs index 148b72d..5e04c1e 100755 --- a/src/main.rs +++ b/src/main.rs @@ -110,7 +110,5 @@ async fn main() -> std::io::Result<()> { server.bind(addr)? }; - println!("woot2"); - server.run().await }