From d596186feaf1aacf94afe7bc6ab2b8ae95061474 Mon Sep 17 00:00:00 2001 From: Mudit Vats Date: Thu, 9 Sep 2021 16:29:21 -0700 Subject: [PATCH] feat: update to OpenSSL 1.1.1l --- .github/workflows/build_all.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- Build.md | 6 ++++-- CentOS7.md | 3 ++- CentOS8.md | 3 ++- Dockerfile | 2 +- scripts/jenkins-pre-build.cmd | 3 ++- scripts/jenkins-pre-build.sh | 3 ++- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 465f60d..18670e9 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -24,7 +24,7 @@ jobs: - name: Create Build Dir run: mkdir build - name: Clone - run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git + run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 - name: Build VCPKG run: cd vcpkg && bootstrap-vcpkg.bat shell: cmd @@ -71,7 +71,7 @@ jobs: - name: Create Build Dir run: mkdir build - name: Clone - run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git + run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 - name: Build VCPKG run: cd vcpkg && ./bootstrap-vcpkg.sh shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1899092..90e95f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Create Build Dir run: mkdir build - name: Clone - run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git + run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 - name: Build VCPKG run: cd vcpkg && bootstrap-vcpkg.bat shell: cmd @@ -54,7 +54,7 @@ jobs: - name: Create Build Dir run: mkdir build - name: Clone - run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git + run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 - name: Build VCPKG run: cd vcpkg && ./bootstrap-vcpkg.sh shell: bash diff --git a/Build.md b/Build.md index ba41e22..08df889 100644 --- a/Build.md +++ b/Build.md @@ -25,8 +25,9 @@ sudo apt install git cmake build-essential curl zip unzip tar pkg-config Open a Terminal window. ``` -git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git +git clone https://github.com/microsoft/vcpkg.git cd vcpkg +git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 ./bootstrap-vcpkg.sh ./vcpkg install cpprestsdk[websockets] ``` @@ -68,8 +69,9 @@ Steps below are for Windows 10 and Visual Studio 2019 Professional. Open an x64 Native Tools Command Prompt for Visual Studio 2019. ``` -git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git +git clone https://github.com/microsoft/vcpkg.git cd vcpkg +git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 bootstrap-vcpkg.bat vcpkg install cpprestsdk[websockets]:x64-windows-static ``` diff --git a/CentOS7.md b/CentOS7.md index a3e0dc5..82acf9c 100644 --- a/CentOS7.md +++ b/CentOS7.md @@ -50,8 +50,9 @@ export PATH=/home/user/Downloads/git:$PATH Using a Terminal window with the PATH and devtoolset enabled per the Dependencies. ``` -git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git +git clone https://github.com/microsoft/vcpkg.git cd vcpkg +git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 ./bootstrap-vcpkg.sh ./vcpkg install cpprestsdk[websockets] ``` diff --git a/CentOS8.md b/CentOS8.md index 2717bc4..6f53df0 100644 --- a/CentOS8.md +++ b/CentOS8.md @@ -28,8 +28,9 @@ sudo yum install cmake Using a Terminal window with the PATH and devtoolset enabled per the Dependencies. ``` -git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git +git clone https://github.com/microsoft/vcpkg.git cd vcpkg +git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 ./bootstrap-vcpkg.sh ./vcpkg install cpprestsdk[websockets] ``` diff --git a/Dockerfile b/Dockerfile index 59476cd..28e0946 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN \ RUN git clone https://github.com/open-amt-cloud-toolkit/rpc.git WORKDIR /rpc RUN mkdir -p build -RUN git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git +RUN git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 RUN cd vcpkg && ./bootstrap-vcpkg.sh RUN ./vcpkg/vcpkg install cpprestsdk[websockets] diff --git a/scripts/jenkins-pre-build.cmd b/scripts/jenkins-pre-build.cmd index 70e1c1e..d0cebb0 100755 --- a/scripts/jenkins-pre-build.cmd +++ b/scripts/jenkins-pre-build.cmd @@ -15,8 +15,9 @@ set VCPKG_DIR=C:\opt\vcpkg-source cd %VCPKG_DIR% REM build vcpkg -git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git +git clone https://github.com/microsoft/vcpkg.git cd vcpkg +git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 cmd /c bootstrap-vcpkg.bat REM install CPPRestSDK diff --git a/scripts/jenkins-pre-build.sh b/scripts/jenkins-pre-build.sh index 7e2c3b1..1868123 100755 --- a/scripts/jenkins-pre-build.sh +++ b/scripts/jenkins-pre-build.sh @@ -12,8 +12,9 @@ apt install git cmake build-essential curl zip unzip tar pkg-config -y #cd "$BASE_DIR"/rpc ## build vcpkg -git -C vcpkg pull || git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git vcpkg +git -C vcpkg pull || git clone https://github.com/microsoft/vcpkg.git vcpkg cd vcpkg +git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0 ./bootstrap-vcpkg.sh ## install CPPRestSDK