Skip to content

Commit c38cc76

Browse files
pjfanningpjfanning
authored
Merge branch 'main' into update-scala-3.3.2
2 parents a3c7eb9 + c8a99aa commit c38cc76

File tree

424 files changed

+8200
-1901
lines changed

Some content is hidden

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

424 files changed

+8200
-1901
lines changed

‎.asf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ github:
1818
- "v*.*.*"
1919

2020
dependabot_alerts: true
21-
dependabot_updates: true
21+
dependabot_updates: false
2222

2323
features:
2424
# Enable wiki for documentation

‎.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,6 @@ e048d92d096a79dc78506c28ef6202c6b46f43b3
7070
2df2e0294f763a8f7c41d31830b3f28059e0bf01
7171
2f120f653b83a5308e2a2deea5e774a2b07b849f
7272
bed11ccbb1bd6b31592e490c36d68cb428296b46
73+
74+
#sort imports of stream modules
75+
c44c0b7cbdab11d85176cfe062288fdcba16c56a

‎.github/workflows/binary-compatibility-checks.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@ jobs:
3030
java-version: 11
3131

3232
- name: Cache Coursier cache
33-
uses: coursier/cache-action@v6.4.0
33+
uses: coursier/cache-action@v6
3434

3535
- name: Enable jvm-opts
3636
run: cp .jvmopts-ci .jvmopts
3737

3838
- name: Compile code
3939
run: sbt +compile
4040

41+
- name: Check if the dependency task in the built correctly
42+
run: sbt dependWalkerCheck
43+
4144
- name: Report MiMa Binary Issues
4245
run: |-
4346
sbt +mimaReportBinaryIssues

‎.github/workflows/build-test-prValidation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fetch-tags: true
2424

2525
- name: Cache Coursier cache
26-
uses: coursier/cache-action@v6.4.0
26+
uses: coursier/cache-action@v6
2727

2828
- name: Setup Java 8
2929
uses: actions/setup-java@v4
@@ -56,7 +56,7 @@ jobs:
5656
java-version: 8
5757

5858
- name: Cache Coursier cache
59-
uses: coursier/cache-action@v6.4.0
59+
uses: coursier/cache-action@v6
6060

6161
- name: Enable jvm-opts
6262
run: cp .jvmopts-ci .jvmopts

‎.github/workflows/format.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
persist-credentials: false
1919

2020
- name: Check project is formatted
21-
uses: jrouly/scalafmt-native-action@v2
21+
uses: jrouly/scalafmt-native-action@v3
2222
with:
23-
version: '3.7.14'
2423
arguments: '--list --mode diff-ref=origin/main'

‎.github/workflows/generate-doc-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ jobs:
4848
run: |-
4949
sudo apt-get install graphviz
5050
51-
- name: Compile docs for all Scala versions
52-
run: sbt +compile:doc
51+
- name: Compile testClass&docs for all Scala versions
52+
run: sbt ";+TestJdk9 / compile ; +compile:doc"

‎.github/workflows/headers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: 8
2121

2222
- name: Cache Coursier cache
23-
uses: coursier/cache-action@v6.4.0
23+
uses: coursier/cache-action@v6
2424

2525
- name: Check headers
2626
run: |-

‎.github/workflows/link-validator.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
java-version: 11
3030

3131
- name: Cache Coursier cache
32-
uses: coursier/cache-action@v6.4.0
32+
uses: coursier/cache-action@v6
3333

3434
- name: Setup Coursier
35-
uses: coursier/setup-action@v1.3.3
35+
uses: coursier/setup-action@v1
3636

3737
- name: Create the Pekko site
38-
run: sbt -Dpekko.genjavadoc.enabled=true "Javaunidoc/doc; Compile/unidoc; docs/paradox"
38+
run: sbt -Dpekko.genjavadoc.enabled=true -Dpekko.genlicensereport.enabled=true "Javaunidoc/doc; Compile/unidoc; docs/paradox"
3939

4040
- name: Run Link Validator
4141
run: cs launch net.runne::site-link-validator:0.2.2 -- scripts/link-validator.conf

‎.github/workflows/nightly-1.0-builds.yml

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
name: Nightly Builds (1.0)
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
workflow_dispatch:
7+
8+
permissions: {}
9+
10+
jobs:
11+
pekko-cluster-metrics-sigar:
12+
name: Pekko Cluster Metrics Test with Sigar
13+
runs-on: ubuntu-20.04
14+
if: github.repository == 'apache/incubator-pekko'
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
fetch-tags: true
21+
ref: 1.0.x
22+
23+
- name: Setup Java 11
24+
uses: actions/setup-java@v4
25+
with:
26+
distribution: temurin
27+
java-version: 11
28+
29+
- name: Cache Coursier cache
30+
uses: coursier/cache-action@v6
31+
32+
- name: Enable jvm-opts
33+
run: cp .jvmopts-ci .jvmopts
34+
35+
- name: sbt cluster-metrics/test
36+
run: |-
37+
sbt \
38+
-Djava.security.egd=file:/dev/./urandom \
39+
-Dpekko.test.sigar=true \
40+
-Dpekko.cluster.assert=on \
41+
-Dpekko.test.timefactor=2 \
42+
-Dpekko.actor.testkit.typed.timefactor=2 \
43+
-Dpekko.test.tags.exclude=gh-exclude,timing \
44+
-Dpekko.log.timestamps=true \
45+
-Dmultinode.XX:MetaspaceSize=128M \
46+
-Dmultinode.Xms256M \
47+
-Dmultinode.Xmx256M \
48+
-Dmultinode.Xlog:gc \
49+
-Dmultinode.XX:+AlwaysActAsServerClassMachine \
50+
clean cluster-metrics/test
51+
52+
pekko-classic-remoting-tests:
53+
name: Pekko Classic Remoting Tests
54+
runs-on: ubuntu-20.04
55+
if: github.repository == 'apache/incubator-pekko'
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
command:
60+
- cluster/test distributed-data/test cluster-tools/test cluster-metrics/test
61+
- cluster-sharding/test
62+
- cluster-typed/test cluster-sharding-typed/test
63+
steps:
64+
- name: Checkout
65+
uses: actions/checkout@v4
66+
with:
67+
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
68+
fetch-depth: 0
69+
fetch-tags: true
70+
ref: 1.0.x
71+
72+
- name: Setup Java 11
73+
uses: actions/setup-java@v4
74+
with:
75+
distribution: temurin
76+
java-version: 11
77+
78+
- name: Cache Coursier cache
79+
uses: coursier/cache-action@v6
80+
81+
- name: Enable jvm-opts
82+
run: cp .jvmopts-ci .jvmopts
83+
84+
- name: sbt ${{ matrix.command }}
85+
# note that this is not running any multi-jvm tests because multi-in-test=false
86+
run: |-
87+
sbt \
88+
-Djava.security.egd=file:/dev/./urandom \
89+
-Dpekko.remote.artery.enabled=off \
90+
-Dpekko.test.timefactor=2 \
91+
-Dpekko.actor.testkit.typed.timefactor=2 \
92+
-Dpekko.test.tags.exclude=gh-exclude,timing \
93+
-Dpekko.test.multi-in-test=false \
94+
-Dpekko.cluster.assert=on \
95+
clean ${{ matrix.command }}
96+
97+
jdk-nightly-build:
98+
name: JDK ${{ matrix.javaVersion }} / Scala ${{ matrix.scalaVersion }}
99+
runs-on: ubuntu-20.04
100+
if: github.repository == 'apache/incubator-pekko'
101+
strategy:
102+
fail-fast: false
103+
matrix:
104+
# No need to specify the full Scala version. Only the Scala
105+
# binary version is required and Pekko build will set the right
106+
# full version from it.
107+
scalaVersion: ["2.12", "2.13", "3.3"]
108+
javaVersion: [8, 11, 17, 21]
109+
steps:
110+
- name: Checkout
111+
uses: actions/checkout@v4
112+
with:
113+
fetch-depth: 0
114+
fetch-tags: true
115+
ref: 1.0.x
116+
117+
- name: Setup Java ${{ matrix.javaVersion }}
118+
uses: actions/setup-java@v4
119+
with:
120+
distribution: temurin
121+
java-version: ${{ matrix.javaVersion }}
122+
123+
- name: Cache Coursier cache
124+
uses: coursier/cache-action@v6
125+
126+
- name: Enable jvm-opts
127+
run: cp .jvmopts-ci .jvmopts
128+
129+
- name: Compile and Test
130+
# note that this is not running any multi-jvm tests because multi-in-test=false
131+
run: |-
132+
sbt \
133+
-Dpekko.cluster.assert=on \
134+
-Dpekko.log.timestamps=true \
135+
-Dpekko.test.timefactor=2 \
136+
-Dpekko.actor.testkit.typed.timefactor=2 \
137+
-Dpekko.test.tags.exclude=gh-exclude,timing \
138+
-Dpekko.test.multi-in-test=false \
139+
clean "+~ ${{ matrix.scalaVersion }} test" checkTestsHaveRun

‎.github/workflows/nightly-builds-aeron.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
java-version: 11
3535

3636
- name: Cache Coursier cache
37-
uses: coursier/cache-action@v6.4.0
37+
uses: coursier/cache-action@v6
3838

3939
- name: Enable jvm-opts
4040
run: cp .jvmopts-ci .jvmopts

‎.github/workflows/nightly-builds.yml

+21-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: 11
2727

2828
- name: Cache Coursier cache
29-
uses: coursier/cache-action@v6.4.0
29+
uses: coursier/cache-action@v6
3030

3131
- name: Enable jvm-opts
3232
run: cp .jvmopts-ci .jvmopts
@@ -84,7 +84,7 @@ jobs:
8484
java-version: 11
8585

8686
- name: Cache Coursier cache
87-
uses: coursier/cache-action@v6.4.0
87+
uses: coursier/cache-action@v6
8888

8989
- name: Enable jvm-opts
9090
run: cp .jvmopts-ci .jvmopts
@@ -112,7 +112,7 @@ jobs:
112112
# No need to specify the full Scala version. Only the Scala
113113
# binary version is required and Pekko build will set the right
114114
# full version from it.
115-
scalaVersion: ["2.12", "2.13"]
115+
scalaVersion: ["2.12", "2.13", "3.3"]
116116
javaVersion: [8, 11, 17, 21]
117117
steps:
118118
- name: Checkout
@@ -128,11 +128,14 @@ jobs:
128128
java-version: ${{ matrix.javaVersion }}
129129

130130
- name: Cache Coursier cache
131-
uses: coursier/cache-action@v6.4.0
131+
uses: coursier/cache-action@v6
132132

133133
- name: Enable jvm-opts
134134
run: cp .jvmopts-ci .jvmopts
135135

136+
- name: Check if the dependency task in the built correctly
137+
run: sbt dependWalkerCheck
138+
136139
- name: Compile and Test
137140
# note that this is not running any multi-jvm tests because multi-in-test=false
138141
run: |-
@@ -179,3 +182,17 @@ jobs:
179182
sbt \
180183
-Dpekko.build.scalaVersion=${{ matrix.scalaVersion }} \
181184
"+~ ${{ matrix.scalaVersion }} publishLocal publishM2"
185+
186+
- name: Install scala-cli
187+
if: ${{ matrix.javaVersion == 11 }}
188+
run: |-
189+
curl -sS "https://virtuslab.github.io/scala-cli-packages/KEY.gpg" | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/scala-cli.gpg 2>/dev/null
190+
sudo curl -s --compressed -o /etc/apt/sources.list.d/scala_cli_packages.list "https://virtuslab.github.io/scala-cli-packages/debian/scala_cli_packages.list"
191+
sudo apt update
192+
sudo apt install scala-cli
193+
194+
- name: Use Scala-CLI to verify jdk 9 classes
195+
if: ${{ matrix.javaVersion == 11 }}
196+
run: |-
197+
chmod +x .github/workflows/verify-jdk9-classes.sh
198+
.github/workflows/verify-jdk9-classes.sh

‎.github/workflows/publish-1.0-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# TODO come up with a better way to control the version, possibly based on git tags
5656
- name: Build Documentation
5757
run: |-
58-
sbt -Dpekko.genjavadoc.enabled=true "set ThisBuild / version := \"1.0.2\"; docs/paradox; unidoc"
58+
sbt -Dpekko.genjavadoc.enabled=true -Dpekko.genlicensereport.enabled=true "set ThisBuild / version := \"1.0.2\"; docs/paradox; unidoc"
5959
6060
# Create directory structure upfront since rsync does not create intermediate directories otherwise
6161
- name: Create directory structure

‎.github/workflows/publish-1.0-nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ jobs:
6565

6666
- name: Build Documentation
6767
run: |-
68-
sbt -Dpekko.genjavadoc.enabled=true docs/paradox unidoc
68+
sbt -Dpekko.genjavadoc.enabled=true -Dpekko.genlicensereport.enabled=true docs/paradox unidoc

‎.github/workflows/publish-nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Build Documentation
6666
run: |-
67-
sbt -Dpekko.genjavadoc.enabled=true docs/paradox unidoc
67+
sbt -Dpekko.genjavadoc.enabled=true -Dpekko.genlicensereport.enabled=true docs/paradox unidoc
6868
6969
# Create directory structure upfront since rsync does not create intermediate directories otherwise
7070
- name: Create nightly directory structure

‎.github/workflows/scala-steward.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ jobs:
1515
github-app-id: ${{ secrets.SCALA_STEWARD_APP_ID }}
1616
github-app-installation-id: ${{ secrets.SCALA_STEWARD_INSTALLATION_ID }}
1717
github-app-key: ${{ secrets.SCALA_STEWARD_PRIVATE_KEY }}
18+
github-app-auth-only: true

‎.github/workflows/scala3-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
java-version: 11
4747

4848
- name: Cache Coursier cache
49-
uses: coursier/cache-action@v6.4.0
49+
uses: coursier/cache-action@v6
5050

5151
- name: Enable jvm-opts
5252
run: cp .jvmopts-ci .jvmopts

‎.github/workflows/scala3-compile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
java-version: 11
4545

4646
- name: Cache Coursier cache
47-
uses: coursier/cache-action@v6.4.0
47+
uses: coursier/cache-action@v6
4848

4949
- name: Enable jvm-opts
5050
run: cp .jvmopts-ci .jvmopts

‎.github/workflows/timing-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version: 11
2929

3030
- name: Cache Coursier cache
31-
uses: coursier/cache-action@v6.4.0
31+
uses: coursier/cache-action@v6
3232

3333
- name: Enable jvm-opts
3434
run: cp .jvmopts-ci .jvmopts

‎.github/workflows/verify-jdk9-classes.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
echo "Checking Scala CLI version..."
4+
scala-cli --version
5+
6+
echo "Starting verification with Scala-CLI..."
7+
8+
for file in stream/target/scala-cli/*.sc; do
9+
echo "Starting verification for with file: $file."
10+
if scala-cli "$file" ; then
11+
echo "Verification successful for $file."
12+
else
13+
echo "Error when verifying $file."
14+
exit 1
15+
fi
16+
done
17+
18+
echo "All verifications successful."

0 commit comments

Comments
 (0)