From 7c53bc21755efbb539d965bcb56a8d59eb16dce3 Mon Sep 17 00:00:00 2001 From: Nick Logozzo Date: Sun, 10 Dec 2023 21:45:58 -0500 Subject: [PATCH] Squashed commit of the following: commit c1e144488e4d2d92e55cb84c95b23899e349d7c3 Author: Nick Logozzo Date: Sun Dec 10 21:45:50 2023 -0500 Update systemcredentialstests.cpp commit 33af46e50a95e903952a1d0635da604aa3f2dcd2 Author: Nick Logozzo Date: Sun Dec 10 21:27:45 2023 -0500 Update windows.yml commit 5384d1be650355c2034674744043f9e6b1ce9ff8 Author: Nick Logozzo Date: Sun Dec 10 21:27:44 2023 -0500 Update linux.yml --- .github/workflows/linux.yml | 8 +++----- .github/workflows/windows.yml | 2 +- tests/systemcredentialstests.cpp | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0519497..aad2f11 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,10 +30,8 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - - name: "Setup libsecret" - run: | - sudo apt install libsecret-1-0 libsecret-1-dev libglib2.0-dev - sudo make --directory=/usr/share/doc/git/contrib/credential/libsecret + - name: "Setup Keyring" + uses: t1m0thyj/unlock-keyring@v1 - name: "Get Conan" uses: turtlebrowser/get-conan@main - name: "Setup Conan Settings" @@ -57,7 +55,7 @@ jobs: working-directory: ${{github.workspace}}/build run: ctest --output-on-failure - name: Upload - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: path: ${{github.workspace}}/install name: ${{matrix.config.artifact}}-${{env.BUILD_TYPE}} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 97c7246..58b6f0e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -46,7 +46,7 @@ jobs: working-directory: ${{github.workspace}}/build run: ctest --output-on-failure - name: Upload - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: path: ${{github.workspace}}/install name: ${{matrix.config.artifact}}-${{env.BUILD_TYPE}} diff --git a/tests/systemcredentialstests.cpp b/tests/systemcredentialstests.cpp index 2b4688c..4bf3e4b 100644 --- a/tests/systemcredentialstests.cpp +++ b/tests/systemcredentialstests.cpp @@ -26,13 +26,12 @@ TEST(SystemCredentialsTests, FetchRandCredential) TEST(SystemCredentialsTests, UpdateRandCredential) { - Credential updatedCred{ randCredentialName, "", "TEST", "abc123" }; + Credential updatedCred{ randCredentialName, "", "", "abc123" }; ASSERT_TRUE(SystemCredentials::updateCredential(updatedCred)); std::optional cred{ SystemCredentials::getCredential(randCredentialName) }; std::cout << cred.value() << std::endl; ASSERT_TRUE(cred.has_value()); ASSERT_TRUE(cred.value().getName() == randCredentialName); - ASSERT_TRUE(cred.value().getUsername() == "TEST"); ASSERT_TRUE(cred.value().getPassword() == "abc123"); }