Skip to content

Commit

Permalink
Merge branch 'series/3.x' into mtl
Browse files Browse the repository at this point in the history
  • Loading branch information
armanbilge authored Nov 24, 2024
2 parents efc096d + efaab4f commit e7ebf43
Show file tree
Hide file tree
Showing 472 changed files with 12,923 additions and 4,423 deletions.
33 changes: 20 additions & 13 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
jvm_highcore_task:
only_if: $CIRRUS_TAG != '' || $CIRRUS_PR != ''
required_pr_labels: Cirrus JVM
container:
image: sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.5_8_1.8.2_3.2.2
cpu: 4
memory: 8G
image: sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.5_8_1.9.0_3.3.0
cpu: 8
memory: 16G
matrix:
- script: sbt '++ 2.12' testsJVM/test
- script: sbt '++ 2.13' testsJVM/test
- script: sbt '++ 3' testsJVM/test
- name: JVM high-core-count 2.13
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 != ''
required_pr_labels: Cirrus JVM
arm_container:
image: sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.5_8_1.8.2_3.2.2
image: sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.5_8_1.9.0_3.3.0
cpu: 4
memory: 8G
matrix:
- script: sbt '++ 2.12' testsJVM/test
- script: sbt '++ 2.13' testsJVM/test
- script: sbt '++ 3' testsJVM/test
- name: JVM ARM high-core-count 2.13
script: sbt '++ 2.13' testsJVM/test ioAppTestsJVM/test
- name: JVM ARM high-core-count 3
script: sbt '++ 3' testsJVM/test ioAppTestsJVM/test

native_arm_task:
only_if: $CIRRUS_TAG != '' || $CIRRUS_PR != ''
required_pr_labels: Cirrus Native
arm_container:
dockerfile: .cirrus/Dockerfile
cpu: 2
memory: 8G
matrix:
- script: sbt '++ 2.12' testsNative/test
- script: sbt '++ 2.13' testsNative/test
- script: sbt '++ 3' testsNative/test
- name: Native ARM 3
script: sbt '++ 3' testsNative/test ioAppTestsNative/test
2 changes: 1 addition & 1 deletion .cirrus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.5_8_1.8.2_3.2.2
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.5_8_1.9.0_3.3.0

RUN apt-get update && apt-get install -y clang
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
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
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ updates:
interval: daily
open-pull-requests-limit: 10
target-branch: docs
- package-ecosystem: docker
directory: "/.cirrus"
schedule:
interval: weekly
20 changes: 20 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
changelog:
categories:
- title: Enhancements
labels:
- ':mushroom: enhancement'
- title: Bug Fixes
labels:
- ':beetle: bug'
- title: Documentation
labels:
- ':books: docs'
- title: Behind the Scenes
labels:
- ':gear: infrastructure'
- ':robot:'
- ':art: backstage'
# Not for published notes, just to make sure we don't forget any accidentally unlabeled PRs
- title: Uncategorized
labels:
- '*'
Loading

0 comments on commit e7ebf43

Please sign in to comment.