Merge "Implement initial hostapd set_ssid()" into main
diff --git a/rust/cli/Cargo.toml b/rust/cli/Cargo.toml
index c6a3ec4..829b0c9 100644
--- a/rust/cli/Cargo.toml
+++ b/rust/cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "netsim-cli"
-version = "0.3.29"
+version = "0.3.30"
edition = "2021"
build = "build.rs"
diff --git a/rust/common/Cargo.toml b/rust/common/Cargo.toml
index 42d4336..fa79677 100644
--- a/rust/common/Cargo.toml
+++ b/rust/common/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "netsim-common"
-version = "0.3.29"
+version = "0.3.30"
edition = "2021"
[lib]
diff --git a/rust/daemon/Cargo.toml b/rust/daemon/Cargo.toml
index 8dced09..ec447da 100644
--- a/rust/daemon/Cargo.toml
+++ b/rust/daemon/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "netsim-daemon"
-version = "0.3.29"
+version = "0.3.30"
edition = "2021"
build = "build.rs"
diff --git a/rust/daemon/src/version.rs b/rust/daemon/src/version.rs
index 4e81624..050628b 100644
--- a/rust/daemon/src/version.rs
+++ b/rust/daemon/src/version.rs
@@ -14,7 +14,7 @@
/// Version library.
-pub const VERSION: &str = "0.3.29";
+pub const VERSION: &str = "0.3.30";
pub fn get_version() -> String {
VERSION.to_owned()
diff --git a/scripts/tasks/run_pytest_task.py b/scripts/tasks/run_pytest_task.py
index 06113ea..cc53b0a 100644
--- a/scripts/tasks/run_pytest_task.py
+++ b/scripts/tasks/run_pytest_task.py
@@ -118,5 +118,9 @@
# TODO: Resolve Windows PyTest failure
if platform.system() != "Windows":
cmd.append("--failures_as_errors")
- run(cmd, get_default_environment(AOSP_ROOT), "e2e_pytests")
+ # Temporarily disabling Mac x86 PyTest due to b/372315152
+ if platform.system() == "Darwin" and platform.machine() == "x86_64":
+ logging.info("Skipping PyTest for darwin-x86_64")
+ else:
+ run(cmd, get_default_environment(AOSP_ROOT), "e2e_pytests")
return True