From 50556cc0cb433c9fdec55f819160cffe511c34f7 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Tue, 28 May 2024 09:29:42 +0200 Subject: [PATCH] alot of updates (mostly file2 porting) --- .github/workflows/cd.yml | 6 ++++++ .github/workflows/ci.yml | 6 ++++++ external/solanaceae_message3 | 2 +- external/solanaceae_ngc_ft1 | 2 +- external/solanaceae_object_store | 2 +- external/solanaceae_tox | 2 +- external/solanaceae_toxcore | 2 +- external/solanaceae_util | 2 +- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 26eafc9..b7d7b2f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -67,6 +67,12 @@ jobs: with: submodules: recursive + - name: update vcpkg + shell: bash + run: | + cd C:/vcpkg + git pull + - name: Install Dependencies run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 561697b..bc6cc25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,12 @@ jobs: with: submodules: recursive + - name: update vcpkg + shell: bash + run: | + cd C:/vcpkg + git pull + - name: Install Dependencies run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static diff --git a/external/solanaceae_message3 b/external/solanaceae_message3 index 96b76dc..f03c4b1 160000 --- a/external/solanaceae_message3 +++ b/external/solanaceae_message3 @@ -1 +1 @@ -Subproject commit 96b76dc67f549b6815846d0b9ea73f53679d8f3d +Subproject commit f03c4b12109489b0636d4ac84b457c9b7c59a5b3 diff --git a/external/solanaceae_ngc_ft1 b/external/solanaceae_ngc_ft1 index eb2a19d..1231e79 160000 --- a/external/solanaceae_ngc_ft1 +++ b/external/solanaceae_ngc_ft1 @@ -1 +1 @@ -Subproject commit eb2a19d8f38c3032258180dae08f65b1574b10e4 +Subproject commit 1231e792a7a23cd92b2b316252baedb39ce81a1e diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store index e26959c..be24b38 160000 --- a/external/solanaceae_object_store +++ b/external/solanaceae_object_store @@ -1 +1 @@ -Subproject commit e26959c380bc76e8c01a517019c4c0a569156b1d +Subproject commit be24b3815bdf4d503a2db15ffaefc8cba7f2fce8 diff --git a/external/solanaceae_tox b/external/solanaceae_tox index 2807239..676e50c 160000 --- a/external/solanaceae_tox +++ b/external/solanaceae_tox @@ -1 +1 @@ -Subproject commit 2807239dea0a84d0c598edf0c22560892b3039de +Subproject commit 676e50c61aa7dd816dca846fd06493d2e3ae4aab diff --git a/external/solanaceae_toxcore b/external/solanaceae_toxcore index cf36790..7cd6a2b 160000 --- a/external/solanaceae_toxcore +++ b/external/solanaceae_toxcore @@ -1 +1 @@ -Subproject commit cf3679018be3f90db0f2f1e9433a966692976421 +Subproject commit 7cd6a2b0de13820a75b9028ae90595cd48a2231c diff --git a/external/solanaceae_util b/external/solanaceae_util index 2420af4..4bda751 160000 --- a/external/solanaceae_util +++ b/external/solanaceae_util @@ -1 +1 @@ -Subproject commit 2420af464f270afaf07391ab51cc94a8b979e00c +Subproject commit 4bda751f76be8e0028977ee918c9ba649bcf6d2d