diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02e982c..623d733 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,10 @@ name: CI -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: jobs: rust: diff --git a/.github/workflows/mean_bean_ci.yml b/.github/workflows/mean_bean_ci.yml index 300cd19..bef1ca0 100644 --- a/.github/workflows/mean_bean_ci.yml +++ b/.github/workflows/mean_bean_ci.yml @@ -1,6 +1,10 @@ name: Mean Bean CI -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: jobs: install-cross: diff --git a/Cargo.lock b/Cargo.lock index 05e49c4..b361223 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "bore-cli" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "clap", @@ -409,18 +409,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -452,7 +443,7 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -463,7 +454,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "io-lifetimes", "rustix", "windows-sys 0.48.0", @@ -551,11 +542,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -868,10 +859,11 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.38" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index 7b30c31..6a68304 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bore-cli" -version = "0.5.0" +version = "0.5.1" authors = ["Eric Zhang "] license = "MIT" description = "A modern, simple TCP tunnel in Rust that exposes local ports to a remote server, bypassing standard NAT connection firewalls." diff --git a/ci/test.bash b/ci/test.bash index f85e248..bbac184 100755 --- a/ci/test.bash +++ b/ci/test.bash @@ -12,5 +12,21 @@ TARGET_TRIPLE=$2 required_arg $CROSS 'CROSS' required_arg $TARGET_TRIPLE '' -$CROSS test --target $TARGET_TRIPLE -$CROSS test --target $TARGET_TRIPLE --all-features +max_attempts=3 +count=0 + +while [ $count -lt $max_attempts ]; do + $CROSS test --target $TARGET_TRIPLE + status=$? + if [ $status -eq 0 ]; then + echo "Test passed" + break + else + echo "Test failed, attempt $(($count + 1))" + fi + count=$(($count + 1)) +done + +if [ $status -ne 0 ]; then + echo "Test failed after $max_attempts attempts" +fi