Skip to content

Commit 620c972

Browse files
committed
Merge branch '2.x-dev' into normalize-the-asset-api
2 parents 831d535 + 2d1fca6 commit 620c972

File tree

5 files changed

+339
-389
lines changed

5 files changed

+339
-389
lines changed

.github/workflows/end-to-end-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Upgrade Chrome Driver
3636
run: php hyde dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
3737
- name: Start Chrome Driver
38-
run: ./vendor/laravel/dusk/bin/chromedriver-linux &
38+
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
3939

4040
- name: Run HydeRC Server
4141
run: php hyde serve &

.github/workflows/smoke-tests.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,33 @@ jobs:
8383
8484
- name: Display Unit Tests Output
8585
if: always()
86-
run: cat test_outputs/unit.log
86+
run: |
87+
cat test_outputs/unit.log
88+
grep -q "Unit tests failed" test_failures && exit 1 || exit 0
8789
8890
- name: Display Feature Hyde Tests Output
8991
if: always()
90-
run: cat test_outputs/feature_hyde.log
92+
run: |
93+
cat test_outputs/feature_hyde.log
94+
grep -q "Feature Hyde tests failed" test_failures && exit 1 || exit 0
9195
9296
- name: Display Feature Framework Tests Output
9397
if: always()
94-
run: cat test_outputs/feature_framework.log
98+
run: |
99+
cat test_outputs/feature_framework.log
100+
grep -q "Feature Framework tests failed" test_failures && exit 1 || exit 0
95101
96102
- name: Display Publications Tests Output
97103
if: always()
98-
run: cat test_outputs/publications.log
104+
run: |
105+
cat test_outputs/publications.log
106+
grep -q "Publications tests failed" test_failures && exit 1 || exit 0
99107
100108
- name: Display Realtime Compiler Tests Output
101109
if: always()
102-
run: cat test_outputs/realtime_compiler.log
110+
run: |
111+
cat test_outputs/realtime_compiler.log
112+
grep -q "Realtime Compiler tests failed" test_failures && exit 1 || exit 0
103113
104114
- name: Merge JUnit XML Reports
105115
if: always()

composer.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)