Skip to content

Commit 6c20666

Browse files
committed
try removing the yarn workarounds
1 parent 481248f commit 6c20666

File tree

1 file changed

+50
-35
lines changed

1 file changed

+50
-35
lines changed

.github/workflows/smoke.yaml

Lines changed: 50 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ jobs:
6969
- name: Clear Yarn Cache
7070
run: yarn cache clean
7171
- run: |
72-
for i in {1..2}; do # workaround for yarn cache issue
73-
sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn" && break
74-
done
72+
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn"
73+
74+
# for i in {1..2}; do # workaround for yarn cache issue
75+
# sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn" && break
76+
# done
7577
7678
run-smoke--yarn--node-24--redoc:
7779
needs: prepare-smoke
@@ -87,9 +89,12 @@ jobs:
8789
- name: Clear Yarn Cache
8890
run: yarn cache clean
8991
- run: |
90-
for i in {1..2}; do # workaround for yarn cache issue
91-
sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn" && break
92-
done
92+
bash ./tests/smoke/basic/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn"
93+
94+
# for i in {1..2}; do # workaround for yarn cache issue
95+
# sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn" && break
96+
# done
97+
9398
run-smoke--pnpm--node-24:
9499
needs: prepare-smoke
95100
runs-on: ubuntu-latest
@@ -187,9 +192,11 @@ jobs:
187192
- name: Clear Yarn Cache
188193
run: yarn cache clean
189194
- run: |
190-
for i in {1..2}; do # workaround for yarn cache issue
191-
sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn" && break
192-
done
195+
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn"
196+
197+
# for i in {1..2}; do # workaround for yarn cache issue
198+
# sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn" && break
199+
# done
193200
194201
run-smoke--yarn--node-22--redoc:
195202
needs: prepare-smoke
@@ -205,9 +212,11 @@ jobs:
205212
- name: Clear Yarn Cache
206213
run: yarn cache clean
207214
- run: |
208-
for i in {1..2}; do # workaround for yarn cache issue
209-
sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn" && break
210-
done
215+
bash ./tests/smoke/basic/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn"
216+
217+
# for i in {1..2}; do # workaround for yarn cache issue
218+
# sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn" && break
219+
# done
211220
run-smoke--pnpm--node-22:
212221
needs: prepare-smoke
213222
runs-on: ubuntu-latest
@@ -257,16 +266,18 @@ jobs:
257266
npm cache clean --force
258267
- name: Run Smoke Tests
259268
run: |
260-
Start-Sleep -Seconds 20 # workaround for yarn cache issue
261-
for ($i = 1; $i -le 3; $i++) {
262-
try {
263-
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz --no-lockfile --network-timeout 100000" "yarn"
264-
if ($LASTEXITCODE -eq 0) { break }
265-
} catch {
266-
if ($i -eq 3) { throw }
267-
Start-Sleep -Seconds 5
268-
}
269-
}
269+
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz --no-lockfile --network-timeout 100000" "yarn"
270+
271+
# Start-Sleep -Seconds 20 # workaround for yarn cache issue
272+
# for ($i = 1; $i -le 3; $i++) {
273+
# try {
274+
# bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz --no-lockfile --network-timeout 100000" "yarn"
275+
# if ($LASTEXITCODE -eq 0) { break }
276+
# } catch {
277+
# if ($i -eq 3) { throw }
278+
# Start-Sleep -Seconds 5
279+
# }
280+
# }
270281
271282
run-smoke--npm--node-20:
272283
needs: prepare-smoke
@@ -308,9 +319,11 @@ jobs:
308319
- name: Clear Yarn Cache
309320
run: yarn cache clean
310321
- run: |
311-
for i in {1..2}; do # workaround for yarn cache issue
312-
sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn" && break
313-
done
322+
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn"
323+
324+
# for i in {1..2}; do # workaround for yarn cache issue
325+
# sleep 5 && bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn" && break
326+
# done
314327
315328
run-smoke--npm--node-20--windows:
316329
needs: prepare-smoke
@@ -344,16 +357,18 @@ jobs:
344357
npm cache clean --force
345358
- name: Run Smoke Tests
346359
run: |
347-
Start-Sleep -Seconds 20 # workaround for yarn cache issue
348-
for ($i = 1; $i -le 3; $i++) {
349-
try {
350-
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz --no-lockfile --network-timeout 100000" "yarn"
351-
if ($LASTEXITCODE -eq 0) { break }
352-
} catch {
353-
if ($i -eq 3) { throw }
354-
Start-Sleep -Seconds 5
355-
}
356-
}
360+
bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz --no-lockfile --network-timeout 100000" "yarn"
361+
362+
# Start-Sleep -Seconds 20 # workaround for yarn cache issue
363+
# for ($i = 1; $i -le 3; $i++) {
364+
# try {
365+
# bash ./tests/smoke/basic/run-smoke.sh "yarn add ./redocly-cli.tgz --no-lockfile --network-timeout 100000" "yarn"
366+
# if ($LASTEXITCODE -eq 0) { break }
367+
# } catch {
368+
# if ($i -eq 3) { throw }
369+
# Start-Sleep -Seconds 5
370+
# }
371+
# }
357372
358373
run-smoke--docker-image:
359374
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)