Skip to content

Commit

Permalink
Merge branch 'series/3.x' into release/3.5.5-major
Browse files Browse the repository at this point in the history
  • Loading branch information
armanbilge committed Oct 29, 2024
2 parents c2faa28 + ecf93db commit 54c2472
Show file tree
Hide file tree
Showing 165 changed files with 5,645 additions and 3,299 deletions.
10 changes: 6 additions & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ jvm_highcore_task:
memory: 16G
matrix:
- name: JVM high-core-count 2.13
script: sbt '++ 2.13' testsJVM/test
script: sbt '++ 2.13' testsJVM/test ioAppTestsJVM/test
- name: JVM high-core-count 3
script: sbt '++ 3' testsJVM/test ioAppTestsJVM/test

jvm_arm_highcore_task:
only_if: $CIRRUS_TAG != '' || $CIRRUS_PR != ''
Expand All @@ -18,9 +20,9 @@ jvm_arm_highcore_task:
memory: 8G
matrix:
- name: JVM ARM high-core-count 2.13
script: sbt '++ 2.13' testsJVM/test
script: sbt '++ 2.13' testsJVM/test ioAppTestsJVM/test
- name: JVM ARM high-core-count 3
script: sbt '++ 3' testsJVM/test
script: sbt '++ 3' testsJVM/test ioAppTestsJVM/test

native_arm_task:
only_if: $CIRRUS_TAG != '' || $CIRRUS_PR != ''
Expand All @@ -31,4 +33,4 @@ native_arm_task:
memory: 8G
matrix:
- name: Native ARM 3
script: sbt '++ 3' testsNative/test
script: sbt '++ 3' testsNative/test ioAppTestsNative/test
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ c3404c6577af33d65017aeaca248d51dab770021

# Scala Steward: Reformat with scalafmt 3.7.1
52c851127a918b050f7b1d33ad71f128cb7bc48e

# Scala Steward: Reformat with scalafmt 3.7.9
db6c201aad98cc3d19f67cc688dfa6332e2fb939
Loading

0 comments on commit 54c2472

Please sign in to comment.