diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index cc326c8075..ea24917d6f 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -21,10 +21,6 @@ run: | sudo apt-get update sudo apt-get install -y gcc-10 g++-10 make mono-complete - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 - sudo update-alternatives --set g++ /usr/bin/g++-10 - sudo update-alternatives --set gcc /usr/bin/gcc-10 - name: Setup VCPKG cache run: | @@ -40,7 +36,7 @@ with: cmakeListsTxtPath: ${{github.workspace}}/cpp/CMakeLists.txt configurePreset: linux-debug - configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build']" + configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build', '-DCMAKE_C_COMPILER=gcc-10', '-DCMAKE_CXX_COMPILER=g++-10']" - name: Polaris PR Scan uses: synopsys-sig/synopsys-action@v1.13.0 diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index df710158ec..80e49d0a81 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -65,7 +65,8 @@ "azure-identity-cpp", "azure-storage-blobs-cpp", "benchmark", - "krb5" + "krb5", + "cyrus-sasl" ], "overrides": [ { "name": "openssl", "version-string": "3.3.0" }, @@ -151,6 +152,7 @@ { "name": "boost-vcpkg-helpers", "version": "1.84.0" }, { "name": "boost-winapi", "version": "1.84.0" }, { "name": "curl", "version": "8.4.0" }, + { "name": "cyrus-sasl", "version": "2.1.28#2" }, { "name": "double-conversion", "version": "3.2.1" }, { "name": "fmt", "version": "10.2.1" }, { "name": "folly", "version-string": "2023.09.25.00" },