Skip to content

Commit 63c370a

Browse files
committed
[green] Make deployment smoke Bash 3 compatible
Signed-off-by: Viwat Vchirawongkwin <viwat.v@chula.ac.th>
1 parent 5b280cc commit 63c370a

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

‎tools/web/deploy/vps/deploy.sh‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,14 +1166,10 @@ retired_public_asset_index=0
11661166
for retired_public_asset_path in "${retired_public_asset_paths[@]}"; do
11671167
for retired_public_asset_method in "${retired_public_asset_methods[@]}"; do
11681168
retired_public_asset_headers="${smoke_root}/retired-public-asset-${retired_public_asset_index}-${retired_public_asset_method}.headers"
1169-
retired_public_asset_curl_mode=()
1170-
if [[ "${retired_public_asset_method}" == HEAD ]]; then
1171-
retired_public_asset_curl_mode=( --head )
1172-
fi
11731169
retired_public_asset_status=$(
11741170
curl --silent --show-error --max-time 30 \
11751171
--location --max-redirs 0 --proto '=https' \
1176-
"${retired_public_asset_curl_mode[@]}" \
1172+
--request "${retired_public_asset_method}" \
11771173
--dump-header "${retired_public_asset_headers}" \
11781174
--output /dev/null \
11791175
--write-out '%{http_code}' \
@@ -1217,14 +1213,10 @@ firmware_not_found_index=0
12171213
for firmware_not_found_path in "${firmware_not_found_paths[@]}"; do
12181214
for firmware_not_found_method in "${firmware_not_found_methods[@]}"; do
12191215
firmware_not_found_headers="${smoke_root}/firmware-not-found-${firmware_not_found_index}-${firmware_not_found_method}.headers"
1220-
firmware_not_found_curl_mode=()
1221-
if [[ "${firmware_not_found_method}" == HEAD ]]; then
1222-
firmware_not_found_curl_mode=( --head )
1223-
fi
12241216
firmware_not_found_status=$(
12251217
curl --silent --show-error --max-time 30 \
12261218
--location --max-redirs 0 --proto '=https' \
1227-
"${firmware_not_found_curl_mode[@]}" \
1219+
--request "${firmware_not_found_method}" \
12281220
--dump-header "${firmware_not_found_headers}" \
12291221
--output /dev/null \
12301222
--write-out '%{http_code}' \

‎tools/web/src/test/vps-deployment-contract.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ describe("Cloudflare-fronted VPS deployment", () => {
119119
expect(script).toContain("/social/pyble-beta-og-1200x630.png");
120120
expect(script).toContain("/social/pyble-beta-og-1200x630.svg");
121121
expect(script).toContain("retired_public_asset_methods=( GET HEAD )");
122-
expect(script).toContain(
123-
'--request "${retired_public_asset_method}"',
124-
);
122+
expect(script).toContain('--request "${retired_public_asset_method}"');
125123
expect(script).not.toContain("retired_public_asset_curl_mode");
126124
expect(script).toMatch(/retired_public_asset_status[\s\S]*?!= 404/);
127125
expect(script).toContain("Cache-Control: *no-store");
@@ -476,9 +474,7 @@ describe("Cloudflare-fronted VPS deployment", () => {
476474
expect(firmwareNotFoundSmoke).toContain(
477475
'--request "${firmware_not_found_method}"',
478476
);
479-
expect(firmwareNotFoundSmoke).not.toContain(
480-
"firmware_not_found_curl_mode",
481-
);
477+
expect(firmwareNotFoundSmoke).not.toContain("firmware_not_found_curl_mode");
482478
expect(firmwareNotFoundSmoke).toContain("esp32-c3-4mb/manifest.json");
483479
expect(firmwareNotFoundSmoke).toContain("--dump-header");
484480
expect(firmwareNotFoundSmoke).toContain("--write-out '%{http_code}'");

0 commit comments

Comments
 (0)