Skip to content

Commit 2323cd0

Browse files
kar-rahul-awskar-rahul-aws
authored
Update download locations to outside repository content (#1943)
Update download locations to outside repository content
1 parent d39ba5d commit 2323cd0

File tree

8 files changed

+120
-99
lines changed

8 files changed

+120
-99
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ on:
99

1010
jobs:
1111
build-check-demos:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
steps:
1414
- name: Clone This Repo
1515
uses: actions/checkout@v2
1616
with:
1717
submodules: recursive
1818
- name: Configure CMake build
1919
run: |
20-
sudo apt-get install -y libmosquitto-dev
21-
curl https://cmake.org/files/v3.2/cmake-3.2.0-Linux-x86_64.tar.gz -o cmake.tar.gz
22-
tar -xf cmake.tar.gz
20+
sudo apt-get install -y libmosquitto-dev cmake
2321
mkdir build && cd build
24-
../cmake-3.2.0-Linux-x86_64/bin/cmake .. \
22+
cmake .. \
2523
-G "Unix Makefiles" \
2624
-DBUILD_DEMOS=1 \
2725
-DCMAKE_BUILD_TYPE=Release \
@@ -46,7 +44,7 @@ jobs:
4644
make -C build/ help | grep demo | tr -d '. ' | xargs make -C build/
4745
make -C demos/jobs/jobs_demo_mosquitto
4846
build-check-demos-cpp:
49-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-latest
5048
steps:
5149
- name: Clone This Repo
5250
uses: actions/checkout@v2
@@ -63,11 +61,9 @@ jobs:
6361
done
6462
- name: Configure CMake build
6563
run: |
66-
sudo apt-get install -y libmosquitto-dev
67-
curl https://cmake.org/files/v3.2/cmake-3.2.0-Linux-x86_64.tar.gz -o cmake.tar.gz
68-
tar -xf cmake.tar.gz
64+
sudo apt-get install -y libmosquitto-dev cmake
6965
mkdir build && cd build
70-
../cmake-3.2.0-Linux-x86_64/bin/cmake .. \
66+
cmake .. \
7167
-G "Unix Makefiles" \
7268
-DBUILD_DEMOS=1 \
7369
-DCMAKE_BUILD_TYPE=Release \
@@ -91,18 +87,17 @@ jobs:
9187
run: |
9288
make -C build/ help | grep demo | tr -d '. ' | xargs make -C build/
9389
build-check-install:
94-
runs-on: ubuntu-20.04
90+
runs-on: ubuntu-latest
9591
steps:
9692
- name: Clone This Repo
9793
uses: actions/checkout@v2
9894
with:
9995
submodules: recursive
10096
- name: Configure CMake for installation of shared libraries at custom location
10197
run: |
102-
curl https://cmake.org/files/v3.2/cmake-3.2.0-Linux-x86_64.tar.gz -o cmake.tar.gz
103-
tar -xf cmake.tar.gz
98+
sudo apt-get install -y cmake
10499
mkdir build && cd build
105-
../cmake-3.2.0-Linux-x86_64/bin/cmake .. \
100+
cmake .. \
106101
-DBUILD_DEMOS=0 \
107102
-DCSDK_HEADER_INSTALL_PATH="$PWD/../shared-libs-headers-install-dir" -DCSDK_LIB_INSTALL_PATH="$PWD/../shared-libs-install-dir"
108103
- name: Install shared libraries and verify custom install location
@@ -121,7 +116,7 @@ jobs:
121116
- name: Configure CMake for installation of static libraries at custom location
122117
run: |
123118
cd build
124-
../cmake-3.2.0-Linux-x86_64/bin/cmake .. \
119+
cmake .. \
125120
-DBUILD_SHARED_LIBRARIES=OFF \
126121
-DBUILD_DEMOS=0 \
127122
-DCSDK_HEADER_INSTALL_PATH="$PWD/../static-libs-headers-install-dir" -DCSDK_LIB_INSTALL_PATH="$PWD/../static-libs-install-dir"
@@ -141,7 +136,7 @@ jobs:
141136
- name: Configure CMake build for system install location and selective installation
142137
run: |
143138
cd build
144-
../cmake-3.2.0-Linux-x86_64/bin/cmake .. \
139+
cmake .. \
145140
-DBUILD_DEMOS=0 -DBUILD_TESTS=0 -DINSTALL_TO_SYSTEM=1 \
146141
-DINSTALL_LIBS="SHADOW;DEFENDER" -DINSTALL_PLATFORM_ABSTRACTIONS=0
147142
- name: Install selected libraries and verify default system installation path is used
@@ -165,7 +160,7 @@ jobs:
165160
# Each line of install_manifest.txt contains the location of an installed library or header
166161
done <install_manifest.txt
167162
complexity:
168-
runs-on: ubuntu-20.04
163+
runs-on: ubuntu-latest
169164
steps:
170165
- uses: actions/checkout@v2
171166
- name: Setup
@@ -175,7 +170,7 @@ jobs:
175170
find platform/ \( -iname '*.c' ! -wholename '*test*' \) |\
176171
xargs complexity --scores --threshold=0 --horrid-threshold=8
177172
spell-check:
178-
runs-on: ubuntu-20.04
173+
runs-on: ubuntu-latest
179174
steps:
180175
- uses: actions/checkout@v2
181176
- name: Install spell
@@ -194,7 +189,7 @@ jobs:
194189
fi
195190
done
196191
formatting:
197-
runs-on: ubuntu-20.04
192+
runs-on: ubuntu-latest
198193
steps:
199194
- uses: actions/checkout@v2
200195
- name: Check formatting
@@ -231,7 +226,7 @@ jobs:
231226
path: ./doxygen.zip
232227
retention-days: 2
233228
git-secrets:
234-
runs-on: ubuntu-20.04
229+
runs-on: ubuntu-latest
235230
steps:
236231
- uses: actions/checkout@v2
237232
with:
@@ -249,15 +244,15 @@ jobs:
249244
git-secrets --register-aws
250245
git-secrets --scan
251246
link-verifier:
252-
runs-on: ubuntu-20.04
247+
runs-on: ubuntu-latest
253248
steps:
254249
- uses: actions/checkout@v2
255250
with:
256251
submodules: recursive
257252
- name: Setup Python for link verifier action
258253
uses: actions/setup-python@v2
259254
with:
260-
python-version: '3.7.10'
255+
python-version: '3.8'
261256
- name: Check Links
262257
env:
263258
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -268,7 +263,7 @@ jobs:
268263
include-file-types: .c,.h,.dox
269264
allowlist-file: ./.github/links_allowlist.txt
270265
verify-manifest:
271-
runs-on: ubuntu-20.04
266+
runs-on: ubuntu-latest
272267
steps:
273268
- uses: actions/checkout@v2
274269
with:

‎.github/workflows/localhost_demo_runner.yml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
build-and-run-localhost-demos:
1212
name: Build and Run Localhost Server Demos
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
steps:
1515
- name: Clone This Repo
1616
uses: actions/checkout@v2
@@ -28,9 +28,7 @@ jobs:
2828

2929
- name: Install CMake
3030
id: install-cmake
31-
uses: lukka/[email protected]
32-
with:
33-
cmakeVersion: 3.2.0
31+
run: sudo apt-get install -y cmake
3432

3533
- name: Generate SSL credentials
3634
id: generate-credentials
@@ -180,28 +178,28 @@ jobs:
180178
if: success() || failure() && steps.build-mqtt-serializer-demo.outcome == 'success'
181179
run: ./build/bin/mqtt_demo_serializer
182180

183-
- name: Run and monitor the MQTT Serializer Demo
184-
if: success() || failure() && steps.build-mqtt-serializer-demo.outcome == 'success'
185-
uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
186-
with:
187-
exe-path: ./build/bin/mqtt_demo_serializer
188-
log-dir: demo_run_logs
189-
timeout-seconds: 300
190-
success-line: "Demo completed successfully."
181+
# - name: Run and monitor the MQTT Serializer Demo
182+
# if: success() || failure() && steps.build-mqtt-serializer-demo.outcome == 'success'
183+
# uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
184+
# with:
185+
# exe-path: ./build/bin/mqtt_demo_serializer
186+
# log-dir: demo_run_logs
187+
# timeout-seconds: 300
188+
# success-line: "Demo completed successfully."
191189

192190
- name: Build the MQTT Subscription Manager Demo
193191
id: build-mqtt-subscription-manager-demo
194192
if: success() || failure() && steps.configure-cmake-build.outcome == 'success'
195193
run: cd build && make mqtt_demo_subscription_manager
196194

197-
- name: Run and monitor the MQTT Subscription Manager Demo
198-
if: success() || failure() && steps.build-mqtt-subscription-manager-demo.outcome == 'success'
199-
uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
200-
with:
201-
exe-path: ./build/bin/mqtt_demo_subscription_manager
202-
log-dir: demo_run_logs
203-
timeout-seconds: 300
204-
success-line: "Demo completed successfully."
195+
# - name: Run and monitor the MQTT Subscription Manager Demo
196+
# if: success() || failure() && steps.build-mqtt-subscription-manager-demo.outcome == 'success'
197+
# uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
198+
# with:
199+
# exe-path: ./build/bin/mqtt_demo_subscription_manager
200+
# log-dir: demo_run_logs
201+
# timeout-seconds: 300
202+
# success-line: "Demo completed successfully."
205203

206204
- name: 'Upload demo logs'
207205
if: always()

‎.github/workflows/release-automation.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
tag-commit:
1515
name: Tag commit
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
1919
uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
4040
create-zip:
4141
needs: tag-commit
4242
name: Create ZIP and verify package for release asset.
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-latest
4444
steps:
4545
- name: Install ZIP tools
4646
run: sudo apt-get install zip unzip
@@ -132,7 +132,7 @@ jobs:
132132
deploy-docs:
133133
needs: tag-commit
134134
name: Deploy doxygen docs
135-
runs-on: ubuntu-20.04
135+
runs-on: ubuntu-latest
136136
steps:
137137
- name: Deploy doxygen for release tag
138138
uses: FreeRTOS/CI-CD-Github-Actions/doxygen-generation@main
@@ -163,7 +163,7 @@ jobs:
163163
- create-zip
164164
- deploy-docs
165165
name: Create Release and Upload Release Asset
166-
runs-on: ubuntu-20.04
166+
runs-on: ubuntu-latest
167167
steps:
168168
- name: Create Release
169169
id: create_release

‎demos/fleet_provisioning/fleet_provisioning_with_csr/pkcs11_operations.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -936,10 +936,12 @@ static int32_t privateKeySigningCallback( mbedtls_pk_context * pContext,
936936
{
937937
ret = CKR_ARGUMENTS_BAD;
938938
}
939-
940-
mech.mechanism = CKM_ECDSA;
941-
memcpy( toBeSigned, pHash, hashLen );
942-
toBeSignedLen = hashLen;
939+
else
940+
{
941+
mech.mechanism = CKM_ECDSA;
942+
memcpy( toBeSigned, pHash, hashLen );
943+
toBeSignedLen = hashLen;
944+
}
943945

944946
if( ret == CKR_OK )
945947
{

0 commit comments

Comments
 (0)