From ffe439bc4f84fa136136db37c84cd047238b8fc2 Mon Sep 17 00:00:00 2001 From: Lauren Datz <105828115+ladatz@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:56:54 -0400 Subject: [PATCH 1/6] Updated chariott submodule to 0.2.1 --- external/chariott | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/chariott b/external/chariott index b8528bc..ba45702 160000 --- a/external/chariott +++ b/external/chariott @@ -1 +1 @@ -Subproject commit b8528bcf356162f7f4e41624e7a2bd459d0be111 +Subproject commit ba45702985837d719c200517c78f07ba4b031c9a From 2242d8504e03f99b7bf982c77e33eed23d0d58f8 Mon Sep 17 00:00:00 2001 From: Lauren Datz <105828115+ladatz@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:48:33 -0400 Subject: [PATCH 2/6] Update --- Cargo.lock | 25 +++++++++---------- .../applications/dog-mode-ui/.editorconfig | 1 + 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc39d66..b99a674 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,7 +141,7 @@ dependencies = [ "futures-lite 2.2.0", "parking", "polling 3.3.2", - "rustix 0.38.30", + "rustix 0.38.32", "slab", "tracing", "windows-sys 0.52.0", @@ -1395,7 +1395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix 0.38.30", + "rustix 0.38.32", "windows-sys 0.52.0", ] @@ -1496,9 +1496,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libz-sys" @@ -1977,7 +1977,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.32", "tracing", "windows-sys 0.52.0", ] @@ -2260,9 +2260,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.4.2", "errno", @@ -2563,14 +2563,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.30", + "rustix 0.38.32", "windows-sys 0.52.0", ] @@ -3130,7 +3129,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.32", ] [[package]] @@ -3314,7 +3313,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.13", - "rustix 0.38.30", + "rustix 0.38.32", ] [[package]] diff --git a/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig b/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig index 98a8790..2148d35 100644 --- a/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig +++ b/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig @@ -47,3 +47,4 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false # Wrapping csharp_preserve_single_line_statements = true csharp_preserve_single_line_blocks = true + From 369bef75519a29c380d99d94cafbb680fa5c8ee5 Mon Sep 17 00:00:00 2001 From: Lauren Datz <105828115+ladatz@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:03:17 -0400 Subject: [PATCH 3/6] Fix h2 --- Cargo.lock | 2 +- intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b99a674..438d980 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ diff --git a/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig b/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig index 2148d35..98a8790 100644 --- a/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig +++ b/intent_brokering/dogmode/applications/dog-mode-ui/.editorconfig @@ -47,4 +47,3 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false # Wrapping csharp_preserve_single_line_statements = true csharp_preserve_single_line_blocks = true - From 3ad0c0bea4a3704b8f8db1e7dfc5c5e4ab9d9cdb Mon Sep 17 00:00:00 2001 From: Lauren Datz <105828115+ladatz@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:14:22 -0400 Subject: [PATCH 4/6] Update --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 438d980..d7704ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1121,7 +1121,7 @@ dependencies = [ name = "h2" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1615,9 +1615,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", From 971ada92914ebd92ce7e7d014d21e090c3de7e1f Mon Sep 17 00:00:00 2001 From: Lauren Datz <105828115+ladatz@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:58:25 -0400 Subject: [PATCH 5/6] Removing whitespace to test workflow --- .../dogmode/applications/dog-mode-ui/src/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs b/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs index e63e22a..d884fe5 100644 --- a/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs +++ b/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs @@ -470,4 +470,4 @@ public T this[int index] IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); public IEnumerator GetEnumerator() => Items.GetEnumerator(); -} +} \ No newline at end of file From 64e4b06e69a80ac74ad911e830c3236b75d1f952 Mon Sep 17 00:00:00 2001 From: Lauren Datz <105828115+ladatz@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:18:00 -0400 Subject: [PATCH 6/6] Add submodules to notice file workflow --- .github/workflows/notice-generation.yaml | 5 ++++- .../dogmode/applications/dog-mode-ui/src/Program.cs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/notice-generation.yaml b/.github/workflows/notice-generation.yaml index 385ae9d..5eb712a 100644 --- a/.github/workflows/notice-generation.yaml +++ b/.github/workflows/notice-generation.yaml @@ -12,7 +12,10 @@ jobs: notice_generation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout repository and submodules + uses: actions/checkout@v3 + with: + submodules: recursive - name: Install stable toolchain run: rustup show - name: Cache Dependencies diff --git a/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs b/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs index d884fe5..e63e22a 100644 --- a/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs +++ b/intent_brokering/dogmode/applications/dog-mode-ui/src/Program.cs @@ -470,4 +470,4 @@ public T this[int index] IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); public IEnumerator GetEnumerator() => Items.GetEnumerator(); -} \ No newline at end of file +}