diff --git a/automap/Cargo.lock b/automap/Cargo.lock index 409a66cff..ef349e7b4 100644 --- a/automap/Cargo.lock +++ b/automap/Cargo.lock @@ -137,7 +137,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "automap" -version = "0.9.1" +version = "0.10.0" dependencies = [ "crossbeam-channel 0.5.8", "flexi_logger", @@ -942,7 +942,7 @@ dependencies = [ [[package]] name = "ip_country" -version = "0.9.1" +version = "0.10.0" dependencies = [ "csv", "ipnetwork", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "masq_lib" -version = "0.9.1" +version = "0.10.0" dependencies = [ "actix", "clap", @@ -2043,7 +2043,7 @@ dependencies = [ [[package]] name = "test_utilities" -version = "0.9.1" +version = "0.10.0" [[package]] name = "textwrap" diff --git a/automap/Cargo.toml b/automap/Cargo.toml index f4fa870de..3acbf1ed4 100644 --- a/automap/Cargo.toml +++ b/automap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "automap" -version = "0.9.1" +version = "0.10.0" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" description = "Library full of code to make routers map ports through firewalls" diff --git a/ci/bump_version.sh b/ci/bump_version.sh index 7790787ea..5ea7382ed 100755 --- a/ci/bump_version.sh +++ b/ci/bump_version.sh @@ -18,7 +18,7 @@ then fi version="$1" -regex="^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$" +regex="^(0|[1-9]\d*)\.(0|[1-9][0-9]*)\.(0|[1-9]\d*)$" if [[ $version =~ $regex ]]; then echo -e "${CYAN}Changing to the version number $version${NC}" diff --git a/ci/collect_results.sh b/ci/collect_results.sh index 732a0dcbf..0bcdad2a8 100755 --- a/ci/collect_results.sh +++ b/ci/collect_results.sh @@ -3,7 +3,7 @@ CI_DIR="$( cd "$( dirname "$0" )" && pwd )" function sudo_ask() { case "$OSTYPE" in - msys) + msys* | cygwin*) "$@" ;; Darwin | darwin* | linux*) @@ -14,7 +14,7 @@ function sudo_ask() { function copy_binaries() { case "$OSTYPE" in - msys) + msys* | cygwin*) copy_windows_binaries ;; Darwin | darwin* | linux*) diff --git a/ci/install_node_toolchain.sh b/ci/install_node_toolchain.sh index 5f1ceda60..31c2a216f 100755 --- a/ci/install_node_toolchain.sh +++ b/ci/install_node_toolchain.sh @@ -24,7 +24,7 @@ function common() { } case "$OSTYPE" in - msys) + msys* | cygwin*) init_for_windows ;; Darwin | darwin*) diff --git a/ci/install_release_toolchain.sh b/ci/install_release_toolchain.sh index adbf482ae..13fc77dcf 100755 --- a/ci/install_release_toolchain.sh +++ b/ci/install_release_toolchain.sh @@ -28,7 +28,7 @@ function install_windows() { } case "$OSTYPE" in - msys) + msys* | cygwin*) install_windows ;; Darwin | darwin*) diff --git a/ci/install_ui_test_toolchain.sh b/ci/install_ui_test_toolchain.sh index 79a217ed0..a72bc5b78 100755 --- a/ci/install_ui_test_toolchain.sh +++ b/ci/install_ui_test_toolchain.sh @@ -23,7 +23,7 @@ function install_windows() { } case "$OSTYPE" in - msys) + msys* | cygwin*) install_windows ;; Darwin | darwin*) diff --git a/ci/multinode_integration_test.sh b/ci/multinode_integration_test.sh index 39abf629a..926c2f473 100755 --- a/ci/multinode_integration_test.sh +++ b/ci/multinode_integration_test.sh @@ -3,7 +3,7 @@ CI_DIR="$( cd "$( dirname "$0" )" && pwd )" case "$OSTYPE" in - msys) + msys* | cygwin*) echo "Multinode Integration Tests don't run under Windows" ;; Darwin | darwin*) diff --git a/ci/publish_results.sh b/ci/publish_results.sh index aa4079802..12ce6ed97 100755 --- a/ci/publish_results.sh +++ b/ci/publish_results.sh @@ -4,7 +4,7 @@ CI_DIR="$( cd "$( dirname "$0" )" && pwd )" STATUS=$1 case "$OSTYPE" in - msys) + msys* | cygwin*) GENERATED_TYPE="windows" ;; Darwin | darwin*) diff --git a/ci/release.sh b/ci/release.sh index 99298d62e..a00d0d326 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -10,7 +10,7 @@ if [[ "$PASSPHRASE" == "" ]]; then echo "Warning: PASSPHRASE is blank. Signing may fail." fi -if [[ "$OSTYPE" == "msys" ]]; then +if [[ "$OSTYPE" == msys* || "$OSTYPE" == cygwin* ]]; then NODE_EXECUTABLEW="${NODE_EXECUTABLE}W.exe" NODE_EXECUTABLE="$NODE_EXECUTABLE.exe" DNS_EXECUTABLEW="${DNS_EXECUTABLE}W.exe" @@ -74,7 +74,7 @@ case "$OSTYPE" in codesign -s 'Developer ID Application: Substratum Services, Inc. (TKDGR66924)' -i 'net.substratum.dns-utility' -fv "target/release/$DNS_EXECUTABLE" codesign -v -v "target/release/$DNS_EXECUTABLE" ;; - msys) + msys* | cygwin*) cd "$CI_DIR/../node" azure_key_vault_sign "target/release/$NODE_EXECUTABLE" azure_key_vault_sign "target/release/$NODE_EXECUTABLEW" @@ -108,7 +108,7 @@ case "$OSTYPE" in node/target/release/$NODE_EXECUTABLE zip -j SubstratumNode-macOS.dmg.zip node-ui/main-process/electron-builder-out/SubstratumNode*.dmg ;; - msys) + msys* | cygwin*) azure_key_vault_sign "node-ui/main-process/electron-builder-out/"SubstratumNode*.exe standard_signtool "node-ui/main-process/electron-builder-out/"SubstratumNode*.exe if command -v 7z >/dev/null 2>&1; then diff --git a/dns_utility/Cargo.lock b/dns_utility/Cargo.lock index 7f87dbdb9..041fddab8 100644 --- a/dns_utility/Cargo.lock +++ b/dns_utility/Cargo.lock @@ -457,7 +457,7 @@ dependencies = [ [[package]] name = "dns_utility" -version = "0.9.1" +version = "0.10.0" dependencies = [ "core-foundation", "ipconfig 0.2.2", @@ -757,7 +757,7 @@ dependencies = [ [[package]] name = "ip_country" -version = "0.9.1" +version = "0.10.0" dependencies = [ "csv", "ipnetwork", @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "masq_lib" -version = "0.9.1" +version = "0.10.0" dependencies = [ "actix", "clap", @@ -1775,7 +1775,7 @@ dependencies = [ [[package]] name = "test_utilities" -version = "0.9.1" +version = "0.10.0" [[package]] name = "textwrap" diff --git a/dns_utility/Cargo.toml b/dns_utility/Cargo.toml index beabe18f5..362eb20c1 100644 --- a/dns_utility/Cargo.toml +++ b/dns_utility/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dns_utility" -version = "0.9.1" +version = "0.10.0" license = "GPL-3.0-only" authors = ["Dan Wiebe ", "MASQ"] copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/dns_utility/ci/integration_tests.sh b/dns_utility/ci/integration_tests.sh index 1cd10857c..9e76b60e0 100755 --- a/dns_utility/ci/integration_tests.sh +++ b/dns_utility/ci/integration_tests.sh @@ -11,7 +11,7 @@ export RUSTFLAGS="-D warnings -Anon-snake-case" cargo test --no-run --release -- --nocapture "_integration" case "$OSTYPE" in - msys) + msys* | cygwin*) echo "Windows" ci/run_integration_tests.sh sudo "$TOOLCHAIN_HOME" ci/run_integration_tests.sh user "$TOOLCHAIN_HOME" diff --git a/ip_country/Cargo.toml b/ip_country/Cargo.toml index ce74c5f48..5a78afa6d 100644 --- a/ip_country/Cargo.toml +++ b/ip_country/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ip_country" -version = "0.9.1" +version = "0.10.0" edition = "2021" license = "GPL-3.0-only" authors = ["Dan Wiebe ", "MASQ"] diff --git a/masq/Cargo.toml b/masq/Cargo.toml index 878b4e172..cd989b5c6 100644 --- a/masq/Cargo.toml +++ b/masq/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "masq" -version = "0.9.1" +version = "0.10.0" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" description = "Reference implementation of user interface for MASQ Node" diff --git a/masq/ci/integration_tests.sh b/masq/ci/integration_tests.sh index c7076a7e0..6470e027d 100755 --- a/masq/ci/integration_tests.sh +++ b/masq/ci/integration_tests.sh @@ -7,7 +7,7 @@ TOOLCHAIN_HOME="$1" pushd "$CI_DIR/.." ci/build.sh # Build here before sudo to make sure we don't produce any root-owned object files case "$OSTYPE" in - msys) + msys* | cygwin*) echo "Windows" ci/run_integration_tests.sh "$TOOLCHAIN_HOME" ;; diff --git a/masq_lib/Cargo.toml b/masq_lib/Cargo.toml index 94ceadb17..3d49e9d30 100644 --- a/masq_lib/Cargo.toml +++ b/masq_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "masq_lib" -version = "0.9.1" +version = "0.10.0" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" description = "Code common to Node and masq; also, temporarily, to dns_utility" diff --git a/masq_lib/src/logger.rs b/masq_lib/src/logger.rs index 5a94127b0..5b405f54c 100644 --- a/masq_lib/src/logger.rs +++ b/masq_lib/src/logger.rs @@ -749,7 +749,7 @@ mod tests { let mut expected_heading_regex = format!( r#"^ - _____ ______ ________ ________ _______ Node Version: \d\.\d\.\d + _____ ______ ________ ________ _______ Node Version: \d\.\d+\.\d / _ | _ /|/ __ /|/ ______/|/ __ /| Database Schema Version: \d+ / / /__/// / / /|/ / / /|_____|/ /|_/ / / OS: {} / / |__|// / / __ / /_____ /|/ / '/ / / client_request_payload::MIGRATIONS {} diff --git a/multinode_integration_tests/Cargo.toml b/multinode_integration_tests/Cargo.toml index d3070e920..617051c28 100644 --- a/multinode_integration_tests/Cargo.toml +++ b/multinode_integration_tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multinode_integration_tests" -version = "0.9.1" +version = "0.10.0" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" description = "" diff --git a/node/Cargo.lock b/node/Cargo.lock index 443b6a132..2f539a109 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -182,7 +182,7 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "automap" -version = "0.9.1" +version = "0.10.0" dependencies = [ "crossbeam-channel 0.5.1", "flexi_logger 0.17.1", @@ -1578,7 +1578,7 @@ dependencies = [ [[package]] name = "ip_country" -version = "0.9.1" +version = "0.10.0" dependencies = [ "csv", "ipnetwork", @@ -1868,7 +1868,7 @@ dependencies = [ [[package]] name = "masq" -version = "0.9.1" +version = "0.10.0" dependencies = [ "atty", "clap", @@ -1889,7 +1889,7 @@ dependencies = [ [[package]] name = "masq_lib" -version = "0.9.1" +version = "0.10.0" dependencies = [ "actix", "clap", @@ -2082,7 +2082,7 @@ dependencies = [ [[package]] name = "multinode_integration_tests" -version = "0.9.1" +version = "0.10.0" dependencies = [ "base64 0.13.0", "crossbeam-channel 0.5.1", @@ -2176,7 +2176,7 @@ dependencies = [ [[package]] name = "node" -version = "0.9.1" +version = "0.10.0" dependencies = [ "actix", "automap", @@ -3750,7 +3750,7 @@ dependencies = [ [[package]] name = "test_utilities" -version = "0.9.1" +version = "0.10.0" [[package]] name = "textwrap" diff --git a/node/Cargo.toml b/node/Cargo.toml index cbcb8ac2d..fc25fbf61 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node" -version = "0.9.1" +version = "0.10.0" license = "GPL-3.0-only" authors = ["Dan Wiebe ", "MASQ"] description = "MASQ Node is the foundation of MASQ Network, an open-source network that allows anyone to allocate spare computing resources to make the internet a free and fair place for the entire world." diff --git a/node/ci/integration_tests.sh b/node/ci/integration_tests.sh index bca7c3bf6..18c68c80e 100755 --- a/node/ci/integration_tests.sh +++ b/node/ci/integration_tests.sh @@ -6,7 +6,7 @@ TOOLCHAIN_HOME="$1" pushd "$CI_DIR/.." case "$OSTYPE" in - msys) + msys* | cygwin*) echo "Windows" [[ $GITHUB_ACTIONS -eq true ]] && net stop sharedaccess || echo ICS already disabled [[ $GITHUB_ACTIONS -eq true ]] && net stop W3SVC || echo W3SVC service already disabled diff --git a/port_exposer/Cargo.lock b/port_exposer/Cargo.lock index ee921a2ed..2551e51dc 100644 --- a/port_exposer/Cargo.lock +++ b/port_exposer/Cargo.lock @@ -20,7 +20,7 @@ checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "port_exposer" -version = "0.9.1" +version = "0.10.0" dependencies = [ "default-net", ] diff --git a/port_exposer/Cargo.toml b/port_exposer/Cargo.toml index 02454f223..5a76f5548 100644 --- a/port_exposer/Cargo.toml +++ b/port_exposer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "port_exposer" -version = "0.9.1" +version = "0.10.0" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only" copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved." diff --git a/test_utilities/Cargo.toml b/test_utilities/Cargo.toml index b4107a19e..080fab44f 100644 --- a/test_utilities/Cargo.toml +++ b/test_utilities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test_utilities" -version = "0.9.1" +version = "0.10.0" edition = "2021" authors = ["Dan Wiebe ", "MASQ"] license = "GPL-3.0-only"