Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions automap/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion automap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "automap"
version = "0.9.1"
version = "0.10.0"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
license = "GPL-3.0-only"
description = "Library full of code to make routers map ports through firewalls"
Expand Down
2 changes: 1 addition & 1 deletion ci/bump_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions ci/collect_results.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CI_DIR="$( cd "$( dirname "$0" )" && pwd )"
function sudo_ask() {
case "$OSTYPE" in
msys)
msys* | cygwin*)
"$@"
;;
Darwin | darwin* | linux*)
Expand All @@ -14,7 +14,7 @@ function sudo_ask() {

function copy_binaries() {
case "$OSTYPE" in
msys)
msys* | cygwin*)
copy_windows_binaries
;;
Darwin | darwin* | linux*)
Expand Down
2 changes: 1 addition & 1 deletion ci/install_node_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function common() {
}

case "$OSTYPE" in
msys)
msys* | cygwin*)
init_for_windows
;;
Darwin | darwin*)
Expand Down
2 changes: 1 addition & 1 deletion ci/install_release_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function install_windows() {
}

case "$OSTYPE" in
msys)
msys* | cygwin*)
install_windows
;;
Darwin | darwin*)
Expand Down
2 changes: 1 addition & 1 deletion ci/install_ui_test_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function install_windows() {
}

case "$OSTYPE" in
msys)
msys* | cygwin*)
install_windows
;;
Darwin | darwin*)
Expand Down
2 changes: 1 addition & 1 deletion ci/multinode_integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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*)
Expand Down
2 changes: 1 addition & 1 deletion ci/publish_results.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CI_DIR="$( cd "$( dirname "$0" )" && pwd )"
STATUS=$1

case "$OSTYPE" in
msys)
msys* | cygwin*)
GENERATED_TYPE="windows"
;;
Darwin | darwin*)
Expand Down
6 changes: 3 additions & 3 deletions ci/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions dns_utility/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dns_utility/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dns_utility"
version = "0.9.1"
version = "0.10.0"
license = "GPL-3.0-only"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."
Expand Down
2 changes: 1 addition & 1 deletion dns_utility/ci/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ip_country/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <dnwiebe@gmail.com>", "MASQ"]
Expand Down
2 changes: 1 addition & 1 deletion masq/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "masq"
version = "0.9.1"
version = "0.10.0"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
license = "GPL-3.0-only"
description = "Reference implementation of user interface for MASQ Node"
Expand Down
2 changes: 1 addition & 1 deletion masq/ci/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down
2 changes: 1 addition & 1 deletion masq_lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "masq_lib"
version = "0.9.1"
version = "0.10.0"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
license = "GPL-3.0-only"
description = "Code common to Node and masq; also, temporarily, to dns_utility"
Expand Down
2 changes: 1 addition & 1 deletion masq_lib/src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
2 changes: 1 addition & 1 deletion multinode_integration_tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "multinode_integration_tests"
version = "0.9.1"
version = "0.10.0"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
license = "GPL-3.0-only"
description = ""
Expand Down
14 changes: 7 additions & 7 deletions node/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "node"
version = "0.9.1"
version = "0.10.0"
license = "GPL-3.0-only"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "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."
Expand Down
2 changes: 1 addition & 1 deletion node/ci/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion port_exposer/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion port_exposer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "port_exposer"
version = "0.9.1"
version = "0.10.0"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
license = "GPL-3.0-only"
copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."
Expand Down
2 changes: 1 addition & 1 deletion test_utilities/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_utilities"
version = "0.9.1"
version = "0.10.0"
edition = "2021"
authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
license = "GPL-3.0-only"
Expand Down
Loading