Skip to content

Commit

Permalink
bumped to 0.3.0-1ddfd2d, added dev tag to npm publish in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
matthme committed Mar 22, 2024
1 parent 3a64f3f commit dd1be0a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ jobs:
if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$";
then
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
npm publish --access public
npm publish --access public --tag dev
elif git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+";
then
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
npm publish --tag next --access public
npm publish --tag next --access public --tag dev
else
echo "Not a release, skipping publish"
fi
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ napi = { version = "2.12.2", default-features = false, features = [
] }
napi-derive = "2.12.2"

holochain_client = "0.5.0-dev.30"
holochain_conductor_api = "0.3.0-beta-dev.39"
holochain_p2p = "0.3.0-beta-dev.38"
holochain_types = "0.3.0-beta-dev.36"
holochain_client = { git = "https://github.com/matthme/holochain-client-rust", branch = "0.3.0-1ddfd2d" }
holochain_conductor_api = { git = "https://github.com/holochain/holochain", rev = "1ddfd2d19c810305ed4d8b9b117c23e338700efe" }
holochain_p2p = { git = "https://github.com/holochain/holochain", rev = "1ddfd2d19c810305ed4d8b9b117c23e338700efe" }
holochain_types = { git = "https://github.com/holochain/holochain", rev = "1ddfd2d19c810305ed4d8b9b117c23e338700efe" }
lair_keystore_api = "0.4.4"

futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lightningrodlabs/we-rust-utils",
"version": "0.300.0",
"version": "0.300.1-dev.0",
"repository": {
"type": "git",
"url": "https://github.com/lightningrodlabs/we-rust-utils"
Expand Down
6 changes: 5 additions & 1 deletion src/conductor_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub fn default_conductor_config(
keystore_connection_url: String,
bootstrap_server_url: String,
signaling_server_url: String,
allowed_origin: String,
) -> String {
let mut network_config = KitsuneP2pConfig::default();
network_config.bootstrap_service = Some(url2::url2!("{}", bootstrap_server_url));
Expand All @@ -26,14 +27,17 @@ pub fn default_conductor_config(
signal_url: signaling_server_url,
});

let mut allowed_origins_map = HashSet::new();
allowed_origins_map.insert(allowed_origin);

let config = ConductorConfig {
data_root_path: Some(DataRootPath::from(PathBuf::from(conductor_environment_path))),
dpki: None,
keystore: KeystoreConfig::LairServer {
connection_url: url2::url2!("{}", keystore_connection_url),
},
admin_interfaces: Some(vec![AdminInterfaceConfig {
driver: InterfaceDriver::Websocket { port: admin_port },
driver: InterfaceDriver::Websocket { port: admin_port, allowed_origins: AllowedOrigins::Origins(allowed_origins_map) },
}]),
network: network_config,
db_sync_strategy: Default::default(),
Expand Down

0 comments on commit dd1be0a

Please sign in to comment.