Skip to content
This repository was archived by the owner on Mar 21, 2023. It is now read-only.

Commit e06d4cb

Browse files
authored
Merge pull request #65 from open-amt-cloud-toolkit/feat_update_openssl
feat: update to OpenSSL 1.1.1l
2 parents 61678dc + d596186 commit e06d4cb

File tree

8 files changed

+17
-11
lines changed

8 files changed

+17
-11
lines changed

.github/workflows/build_all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Create Build Dir
2525
run: mkdir build
2626
- name: Clone
27-
run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
27+
run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
2828
- name: Build VCPKG
2929
run: cd vcpkg && bootstrap-vcpkg.bat
3030
shell: cmd
@@ -71,7 +71,7 @@ jobs:
7171
- name: Create Build Dir
7272
run: mkdir build
7373
- name: Clone
74-
run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
74+
run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
7575
- name: Build VCPKG
7676
run: cd vcpkg && ./bootstrap-vcpkg.sh
7777
shell: bash

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Create Build Dir
2222
run: mkdir build
2323
- name: Clone
24-
run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
24+
run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
2525
- name: Build VCPKG
2626
run: cd vcpkg && bootstrap-vcpkg.bat
2727
shell: cmd
@@ -54,7 +54,7 @@ jobs:
5454
- name: Create Build Dir
5555
run: mkdir build
5656
- name: Clone
57-
run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
57+
run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
5858
- name: Build VCPKG
5959
run: cd vcpkg && ./bootstrap-vcpkg.sh
6060
shell: bash

Build.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ sudo apt install git cmake build-essential curl zip unzip tar pkg-config
2525
Open a Terminal window.
2626

2727
```
28-
git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
28+
git clone https://github.com/microsoft/vcpkg.git
2929
cd vcpkg
30+
git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
3031
./bootstrap-vcpkg.sh
3132
./vcpkg install cpprestsdk[websockets]
3233
```
@@ -68,8 +69,9 @@ Steps below are for Windows 10 and Visual Studio 2019 Professional.
6869
Open an x64 Native Tools Command Prompt for Visual Studio 2019.
6970

7071
```
71-
git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
72+
git clone https://github.com/microsoft/vcpkg.git
7273
cd vcpkg
74+
git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
7375
bootstrap-vcpkg.bat
7476
vcpkg install cpprestsdk[websockets]:x64-windows-static
7577
```

CentOS7.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ export PATH=/home/user/Downloads/git:$PATH
5050
Using a Terminal window with the PATH and devtoolset enabled per the Dependencies.
5151

5252
```
53-
git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
53+
git clone https://github.com/microsoft/vcpkg.git
5454
cd vcpkg
55+
git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
5556
./bootstrap-vcpkg.sh
5657
./vcpkg install cpprestsdk[websockets]
5758
```

CentOS8.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ sudo yum install cmake
2828
Using a Terminal window with the PATH and devtoolset enabled per the Dependencies.
2929

3030
```
31-
git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
31+
git clone https://github.com/microsoft/vcpkg.git
3232
cd vcpkg
33+
git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
3334
./bootstrap-vcpkg.sh
3435
./vcpkg install cpprestsdk[websockets]
3536
```

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
RUN git clone https://github.com/open-amt-cloud-toolkit/rpc.git
1616
WORKDIR /rpc
1717
RUN mkdir -p build
18-
RUN git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
18+
RUN git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
1919
RUN cd vcpkg && ./bootstrap-vcpkg.sh
2020
RUN ./vcpkg/vcpkg install cpprestsdk[websockets]
2121

scripts/jenkins-pre-build.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ set VCPKG_DIR=C:\opt\vcpkg-source
1515
cd %VCPKG_DIR%
1616

1717
REM build vcpkg
18-
git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
18+
git clone https://github.com/microsoft/vcpkg.git
1919
cd vcpkg
20+
git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
2021
cmd /c bootstrap-vcpkg.bat
2122

2223
REM install CPPRestSDK

scripts/jenkins-pre-build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ apt install git cmake build-essential curl zip unzip tar pkg-config -y
1212

1313
#cd "$BASE_DIR"/rpc
1414
## build vcpkg
15-
git -C vcpkg pull || git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git vcpkg
15+
git -C vcpkg pull || git clone https://github.com/microsoft/vcpkg.git vcpkg
1616
cd vcpkg
17+
git checkout 772d435ba18bf2f342458e0187ab7b48b84fe3f0
1718
./bootstrap-vcpkg.sh
1819

1920
## install CPPRestSDK

0 commit comments

Comments
 (0)