Skip to content

Commit 4f750b6

Browse files
GregoryTravisGregoryTravis
committed
Merge branch 'develop' into wip/gmt/11485-clear-cache
2 parents 131c52e + 456031b commit 4f750b6

File tree

130 files changed

+516
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+516
-353
lines changed

Diff for: ‎.github/CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ tsconfig.json
3131

3232
# GUI/Dashboard
3333
/app @Frizi @farmaazon @vitvakatu @kazcw @AdRiley @PabloBuchu @indiv0 @somebody1234 @MrFlashAccount
34-
/app/gui/e2e/dashboard @PabloBuchu @indiv0 @somebody1234 @MrFlashAccount
35-
/app/gui/e2e/project-view @Frizi @farmaazon @vitvakatu @kazcw @AdRiley
34+
/app/gui/integration-test/dashboard @PabloBuchu @indiv0 @somebody1234 @MrFlashAccount
35+
/app/gui/integration-test/project-view @Frizi @farmaazon @vitvakatu @kazcw @AdRiley
3636
/app/gui/src/dashboard @PabloBuchu @indiv0 @somebody1234 @MrFlashAccount
3737
/app/gui/src/project-view @Frizi @farmaazon @vitvakatu @kazcw @AdRiley
3838
/app/ide-desktop/ @PabloBuchu @indiv0 @somebody1234 @MrFlashAccount

Diff for: ‎.github/workflows/engine-nightly.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ jobs:
270270
- run: ./run backend test jvm
271271
env:
272272
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
273-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
273+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
274274
name: Engine Test Reporter
275275
uses: dorny/test-reporter@v1
276276
with:
@@ -327,7 +327,7 @@ jobs:
327327
- run: ./run backend test jvm
328328
env:
329329
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
330-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
330+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
331331
name: Engine Test Reporter
332332
uses: dorny/test-reporter@v1
333333
with:
@@ -382,7 +382,7 @@ jobs:
382382
- run: ./run backend test jvm
383383
env:
384384
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
385-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
385+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
386386
name: Engine Test Reporter
387387
uses: dorny/test-reporter@v1
388388
with:
@@ -438,7 +438,7 @@ jobs:
438438
- run: ./run backend test jvm
439439
env:
440440
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
441-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
441+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
442442
name: Engine Test Reporter
443443
uses: dorny/test-reporter@v1
444444
with:
@@ -494,7 +494,7 @@ jobs:
494494
- run: ./run backend test jvm
495495
env:
496496
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
497-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
497+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
498498
name: Engine Test Reporter
499499
uses: dorny/test-reporter@v1
500500
with:
@@ -553,7 +553,7 @@ jobs:
553553
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
554554
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
555555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
556-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
556+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
557557
name: Standard Library Test Reporter
558558
uses: dorny/test-reporter@v1
559559
with:
@@ -613,7 +613,7 @@ jobs:
613613
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
614614
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
615615
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
616-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
616+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
617617
name: Standard Library Test Reporter
618618
uses: dorny/test-reporter@v1
619619
with:
@@ -671,7 +671,7 @@ jobs:
671671
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
672672
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
673673
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
674-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
674+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
675675
name: Standard Library Test Reporter
676676
uses: dorny/test-reporter@v1
677677
with:
@@ -730,7 +730,7 @@ jobs:
730730
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
731731
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
732732
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
733-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
733+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
734734
name: Standard Library Test Reporter
735735
uses: dorny/test-reporter@v1
736736
with:
@@ -789,7 +789,7 @@ jobs:
789789
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
790790
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
791791
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
792-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
792+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
793793
name: Standard Library Test Reporter
794794
uses: dorny/test-reporter@v1
795795
with:

Diff for: ‎.github/workflows/extra-nightly-tests.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
ENSO_SNOWFLAKE_USER: ${{ secrets.ENSO_SNOWFLAKE_USER }}
5656
ENSO_SNOWFLAKE_WAREHOUSE: ${{ secrets.ENSO_SNOWFLAKE_WAREHOUSE }}
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
58+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
5959
name: Extra Library Test Reporter
6060
uses: dorny/test-reporter@v1
6161
with:
@@ -77,6 +77,7 @@ jobs:
7777
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7878
env:
7979
GRAAL_EDITION: GraalVM CE
80+
REPORT_ALL_TESTS: "1"
8081
permissions:
8182
checks: write
8283
enso-build-ci-gen-job-standard-library-tests-graal-vm-ce-linux-amd64:
@@ -118,7 +119,7 @@ jobs:
118119
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
119120
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
120121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
121-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
122+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
122123
name: Standard Library Test Reporter
123124
uses: dorny/test-reporter@v1
124125
with:
@@ -140,6 +141,7 @@ jobs:
140141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
141142
env:
142143
GRAAL_EDITION: GraalVM CE
144+
REPORT_ALL_TESTS: "1"
143145
permissions:
144146
checks: write
145147
env:

Diff for: ‎.github/workflows/gui-checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: 🧪 Unit Tests
7171
id: unit-tests
7272
continue-on-error: true
73-
run: pnpm run ci:test
73+
run: pnpm run ci:unit-test
7474

7575
- name: 📝 Annotate Code Linting Results
7676
if: always()
@@ -146,7 +146,7 @@ jobs:
146146

147147
- name: 🎭 Playwright Tests
148148
working-directory: app/gui
149-
run: pnpm run e2e --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
149+
run: pnpm run test:integration --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
150150

151151
- name: ⬆️ Upload blob report to GitHub Actions Artifacts
152152
if: ${{ !cancelled() }}

Diff for: ‎.github/workflows/gui.yml

+21-1
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,13 @@ jobs:
372372
ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
373373
ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
374374
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
375+
- if: failure()
376+
name: Upload Test Traces
377+
uses: actions/upload-artifact@v4
378+
with:
379+
compression-level: 0
380+
name: test-traces-linux-amd64
381+
path: app/ide-desktop/client/test-traces
375382
- run: rm $HOME/.enso/credentials
376383
env:
377384
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -444,6 +451,13 @@ jobs:
444451
ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
445452
ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
446453
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
454+
- if: failure()
455+
name: Upload Test Traces
456+
uses: actions/upload-artifact@v4
457+
with:
458+
compression-level: 0
459+
name: test-traces-macos-amd64
460+
path: app/ide-desktop/client/test-traces
447461
- run: rm $HOME/.enso/credentials
448462
env:
449463
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -512,7 +526,13 @@ jobs:
512526
ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
513527
ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
514528
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
515-
continue-on-error: true
529+
- if: failure()
530+
name: Upload Test Traces
531+
uses: actions/upload-artifact@v4
532+
with:
533+
compression-level: 0
534+
name: test-traces-windows-amd64
535+
path: app/ide-desktop/client/test-traces
516536
- run: rm $HOME/.enso/credentials
517537
env:
518538
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/nightly.yml

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ on:
1515
options:
1616
- nodejs
1717
- polyglot
18+
workflow_call:
19+
inputs:
20+
ydoc:
21+
description: What kind of Ydoc image to build.
22+
required: false
23+
type: string
24+
default: nodejs
1825
jobs:
1926
promote-nightly:
2027
name: Promote nightly

Diff for: ‎.github/workflows/scala-new.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
- run: ./run backend test jvm
194194
env:
195195
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
196-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
196+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
197197
name: Engine Test Reporter
198198
uses: dorny/test-reporter@v1
199199
with:
@@ -248,7 +248,7 @@ jobs:
248248
- run: ./run backend test jvm
249249
env:
250250
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
251-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
251+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
252252
name: Engine Test Reporter
253253
uses: dorny/test-reporter@v1
254254
with:
@@ -304,7 +304,7 @@ jobs:
304304
- run: ./run backend test jvm
305305
env:
306306
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
307-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
307+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
308308
name: Engine Test Reporter
309309
uses: dorny/test-reporter@v1
310310
with:
@@ -363,7 +363,7 @@ jobs:
363363
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
364364
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
365365
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
366-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
366+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
367367
name: Standard Library Test Reporter
368368
uses: dorny/test-reporter@v1
369369
with:
@@ -421,7 +421,7 @@ jobs:
421421
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
422422
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
423423
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
424-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
424+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
425425
name: Standard Library Test Reporter
426426
uses: dorny/test-reporter@v1
427427
with:
@@ -480,7 +480,7 @@ jobs:
480480
ENSO_LIB_S3_AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
481481
ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
482482
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
483-
- if: (success() || failure()) && github.event.pull_request.head.repo.full_name == github.repository
483+
- if: (success() || failure()) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
484484
name: Standard Library Test Reporter
485485
uses: dorny/test-reporter@v1
486486
with:

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -182,5 +182,6 @@ test-results
182182
##########################
183183

184184
test-results/
185+
test-traces/
185186
playwright-report/
186187
playwright/.cache/

Diff for: ‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
- [Visualizations on components are slightly transparent when not
3838
focused][11582].
3939
- [New design for vector-editing widget][11620]
40+
- [The `:` type operator can now be chained][11671]
4041

4142
[11151]: https://github.com/enso-org/enso/pull/11151
4243
[11271]: https://github.com/enso-org/enso/pull/11271
@@ -60,6 +61,7 @@
6061
[11612]: https://github.com/enso-org/enso/pull/11612
6162
[11582]: https://github.com/enso-org/enso/pull/11582
6263
[11620]: https://github.com/enso-org/enso/pull/11620
64+
[11671]: https://github.com/enso-org/enso/pull/11671
6365

6466
#### Enso Standard Library
6567

0 commit comments

Comments
 (0)