From bb8211ae03221210c97df80461e0807346fe5af9 Mon Sep 17 00:00:00 2001 From: Mudit Vats Date: Wed, 25 Aug 2021 08:19:02 -0700 Subject: [PATCH 1/3] feat: Update docs and scripts for Windows and Ubuntu. --- Build.md | 4 ++-- scripts/jenkins-pre-build.cmd | 2 +- scripts/jenkins-pre-build.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Build.md b/Build.md index be47cb0..ba41e22 100644 --- a/Build.md +++ b/Build.md @@ -25,7 +25,7 @@ sudo apt install git cmake build-essential curl zip unzip tar pkg-config Open a Terminal window. ``` -git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git +git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git cd vcpkg ./bootstrap-vcpkg.sh ./vcpkg install cpprestsdk[websockets] @@ -68,7 +68,7 @@ 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 2020.11-1 https://github.com/microsoft/vcpkg.git +git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git cd vcpkg bootstrap-vcpkg.bat vcpkg install cpprestsdk[websockets]:x64-windows-static diff --git a/scripts/jenkins-pre-build.cmd b/scripts/jenkins-pre-build.cmd index 0d48cb5..70e1c1e 100755 --- a/scripts/jenkins-pre-build.cmd +++ b/scripts/jenkins-pre-build.cmd @@ -15,7 +15,7 @@ set VCPKG_DIR=C:\opt\vcpkg-source cd %VCPKG_DIR% REM build vcpkg -git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git +git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git cd vcpkg cmd /c bootstrap-vcpkg.bat diff --git a/scripts/jenkins-pre-build.sh b/scripts/jenkins-pre-build.sh index 3fb1543..7e2c3b1 100755 --- a/scripts/jenkins-pre-build.sh +++ b/scripts/jenkins-pre-build.sh @@ -12,7 +12,7 @@ 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 2020.11-1 https://github.com/microsoft/vcpkg.git vcpkg +git -C vcpkg pull || git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git vcpkg cd vcpkg ./bootstrap-vcpkg.sh From cb9539639ac6d9d38de1c6edac077f45b6ea9ede Mon Sep 17 00:00:00 2001 From: Mudit Vats Date: Thu, 26 Aug 2021 12:54:43 -0700 Subject: [PATCH 2/3] feat: Update to latest vcpkg --- CentOS7.md | 2 +- CentOS8.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CentOS7.md b/CentOS7.md index 79b8898..a3e0dc5 100644 --- a/CentOS7.md +++ b/CentOS7.md @@ -50,7 +50,7 @@ export PATH=/home/user/Downloads/git:$PATH Using a Terminal window with the PATH and devtoolset enabled per the Dependencies. ``` -git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git +git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git cd vcpkg ./bootstrap-vcpkg.sh ./vcpkg install cpprestsdk[websockets] diff --git a/CentOS8.md b/CentOS8.md index 10d97f2..2717bc4 100644 --- a/CentOS8.md +++ b/CentOS8.md @@ -28,7 +28,7 @@ sudo yum install cmake Using a Terminal window with the PATH and devtoolset enabled per the Dependencies. ``` -git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git +git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git cd vcpkg ./bootstrap-vcpkg.sh ./vcpkg install cpprestsdk[websockets] From 2a460e90dc53b6d63c17e60349469d9cf16759be Mon Sep 17 00:00:00 2001 From: Mudit Vats Date: Thu, 26 Aug 2021 13:27:36 -0700 Subject: [PATCH 3/3] feat: update workflows and Docker build. --- .github/workflows/build_all.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 1214b42..465f60d 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 2020.11-1 https://github.com/microsoft/vcpkg.git + run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git - 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 2020.11-1 https://github.com/microsoft/vcpkg.git + run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git - name: Build VCPKG run: cd vcpkg && ./bootstrap-vcpkg.sh shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6855388..1899092 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 2020.11-1 https://github.com/microsoft/vcpkg.git + run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git - 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 2020.11-1 https://github.com/microsoft/vcpkg.git + run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git - name: Build VCPKG run: cd vcpkg && ./bootstrap-vcpkg.sh shell: bash diff --git a/Dockerfile b/Dockerfile index f9f37fc..59476cd 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 2020.11-1 https://github.com/microsoft/vcpkg.git +RUN git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git RUN cd vcpkg && ./bootstrap-vcpkg.sh RUN ./vcpkg/vcpkg install cpprestsdk[websockets]