Skip to content

Commit

Permalink
Merge branch 'master' into guillaume/ci/use-git-tag-when-publishing-e…
Browse files Browse the repository at this point in the history
…verything
  • Loading branch information
GuillaumeDecMeetsMore committed Sep 24, 2024
2 parents 33da0c2 + 4bc21ab commit 64499fb
Show file tree
Hide file tree
Showing 35 changed files with 1,651 additions and 493 deletions.
23 changes: 23 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directories:
- "/clients/javascript"
schedule:
interval: "weekly"
- package-ecosystem: "cargo" # See documentation for possible values
directories:
- "/bins/nittei"
- "/clients/rust"
- "/crates/api"
- "/crates/api_structs"
- "/crates/domain"
- "/crates/infra"
- "/crates/utils"
schedule:
interval: "weekly"
112 changes: 112 additions & 0 deletions Cargo.lock

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

5 changes: 4 additions & 1 deletion bins/nittei/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ authors = ["Fredrik Meringdal", "Meetsmore"]
edition = "2021"
default-run = "nittei"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lints]
workspace = true

[dependencies]
nittei_api = { workspace = true }
Expand Down Expand Up @@ -44,3 +45,5 @@ chrono-tz = "0.8.1"

[dev-dependencies]
nittei_sdk = { workspace = true }
futures = "0.3"
test-log = "0.2"
18 changes: 18 additions & 0 deletions bins/nittei/tests/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,12 @@ async fn test_crud_events() {
let event = admin_client
.event
.create(CreateEventInput {
parent_id: None,
title: None,
description: None,
location: None,
status: nittei_domain::CalendarEventStatus::Tentative,
all_day: None,
user_id: user.id.clone(),
calendar_id: calendar.id.clone(),
duration: 1000 * 60 * 60,
Expand Down Expand Up @@ -708,6 +714,12 @@ async fn test_freebusy_multiple() {
let _event1 = admin_client
.event
.create(CreateEventInput {
parent_id: None,
title: None,
description: None,
location: None,
status: nittei_domain::CalendarEventStatus::Tentative,
all_day: None,
user_id: user1.id.clone(),
calendar_id: calendar1.id.clone(),
duration: 1000 * 60 * 60,
Expand All @@ -724,6 +736,12 @@ async fn test_freebusy_multiple() {
let _event2 = admin_client
.event
.create(CreateEventInput {
parent_id: None,
title: None,
description: None,
location: None,
status: nittei_domain::CalendarEventStatus::Tentative,
all_day: None,
user_id: user2.id.clone(),
calendar_id: calendar2.id.clone(),
duration: 1000 * 60 * 60,
Expand Down
Loading

0 comments on commit 64499fb

Please sign in to comment.