Skip to content

Commit 43680c0

Browse files
He-PinHe-Pin
authored
Merge branch 'main' into He-Pin-patch-1
2 parents b99fdf0 + 373c07a commit 43680c0

File tree

242 files changed

+2955
-1291
lines changed

Some content is hidden

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

242 files changed

+2955
-1291
lines changed

Diff for: ‎.asf.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ github:
5858
dismiss_stale_reviews: false
5959
require_code_owner_reviews: false
6060
required_approving_review_count: 1
61+
1.1.x:
62+
required_status_checks:
63+
# strict means "Require branches to be up to date before merging".
64+
strict: false
65+
# contexts are the names of checks that must pass
66+
contexts:
67+
- Code is formatted
68+
- Check headers
69+
required_pull_request_reviews:
70+
dismiss_stale_reviews: false
71+
require_code_owner_reviews: false
72+
required_approving_review_count: 1
6173

6274
notifications:
6375
commits: [email protected]

Diff for: ‎.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,6 @@ c44c0b7cbdab11d85176cfe062288fdcba16c56a
7676

7777
# Scala Steward: Reformat with scalafmt 3.8.2
7878
38b03829b4e38e983521f3efd7e589d315658f18
79+
80+
# Scala Steward: Reformat with scalafmt 3.8.4
81+
f48453e60a8d11f74acc7a10d3a9da90b8acd4af

Diff for: ‎.github/autolabeler.yml

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# license agreements; and to You under the Apache License, version 2.0:
3+
#
4+
# https://www.apache.org/licenses/LICENSE-2.0
5+
#
6+
# This file is part of the Apache Pekko project, which was derived from Akka.
7+
#
8+
19
# configuration for https://github.com/probot/autolabeler
210

311
dependency-change: "/project/Dependencies.scala"

Diff for: ‎.github/workflows/binary-compatibility-checks.yml

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
name: Binary Compatibility
219

320
on:
@@ -6,6 +23,7 @@ on:
623
branches:
724
- main
825
- 1.0.x
26+
- 1.1.x
927

1028
permissions: {}
1129

@@ -17,7 +35,7 @@ jobs:
1735
strategy:
1836
fail-fast: false
1937
env:
20-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2139
steps:
2240
- name: Checkout
2341
uses: actions/checkout@v4

Diff for: ‎.github/workflows/build-test-prValidation.yml

+60-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# license agreements; and to You under the Apache License, version 2.0:
3+
#
4+
# https://www.apache.org/licenses/LICENSE-2.0
5+
#
6+
# This file is part of the Apache Pekko project, which was derived from Akka.
7+
#
8+
19
name: Pull Requests
210

311
on:
@@ -15,7 +23,7 @@ jobs:
1523
name: Check / Code Style
1624
runs-on: ubuntu-22.04
1725
env:
18-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
26+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1927
steps:
2028
- name: Checkout
2129
uses: actions/checkout@v4
@@ -47,7 +55,7 @@ jobs:
4755
name: Check / Tests
4856
runs-on: ubuntu-22.04
4957
env:
50-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
58+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5159
steps:
5260
- name: Checkout
5361
uses: actions/checkout@v4
@@ -99,13 +107,61 @@ jobs:
99107
-Dpekko.test.multi-node=false \
100108
-Dsbt.log.noformat=false \
101109
-Dpekko.log.timestamps=true \
110+
-Dio.netty.leakDetection.level=PARANOID \
102111
validatePullRequest
103112
113+
pekko-classic-remoting-tests:
114+
name: Pekko Classic Remoting Tests
115+
runs-on: ubuntu-22.04
116+
if: github.repository == 'apache/pekko'
117+
strategy:
118+
fail-fast: false
119+
matrix:
120+
command:
121+
- cluster/test distributed-data/test cluster-tools/test cluster-metrics/test
122+
steps:
123+
- name: Checkout
124+
uses: actions/checkout@v4
125+
with:
126+
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
127+
fetch-depth: 0
128+
fetch-tags: true
129+
130+
- name: Setup Java 11
131+
uses: actions/setup-java@v4
132+
with:
133+
distribution: temurin
134+
java-version: 11
135+
136+
- name: Install sbt
137+
uses: sbt/setup-sbt@v1
138+
139+
- name: Cache Coursier cache
140+
uses: coursier/cache-action@v6
141+
142+
- name: Enable jvm-opts
143+
run: cp .jvmopts-ci .jvmopts
144+
145+
- name: sbt ${{ matrix.command }}
146+
env:
147+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
148+
# note that this is not running any multi-jvm tests because multi-in-test=false
149+
run: |-
150+
sbt \
151+
-Djava.security.egd=file:/dev/./urandom \
152+
-Dpekko.remote.artery.enabled=off \
153+
-Dpekko.test.timefactor=2 \
154+
-Dpekko.actor.testkit.typed.timefactor=2 \
155+
-Dpekko.test.tags.exclude=gh-exclude,timing \
156+
-Dpekko.test.multi-in-test=false \
157+
-Dpekko.cluster.assert=on \
158+
clean ${{ matrix.command }}
159+
104160
jdk-21-extra-tests:
105161
name: Java 21 Extra Tests (including all tests that need Java 9+)
106162
runs-on: ubuntu-22.04
107163
env:
108-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
164+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
109165
steps:
110166
- name: Checkout
111167
uses: actions/checkout@v4
@@ -142,4 +198,5 @@ jobs:
142198
-Dpekko.test.multi-node=false \
143199
-Dsbt.log.noformat=false \
144200
-Dpekko.log.timestamps=true \
201+
-Dio.netty.leakDetection.level=PARANOID \
145202
TestJdk9/test

Diff for: ‎.github/workflows/dependency-graph.yml

+20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
name: Update Dependency Graph
219
on:
320
push:
@@ -20,3 +37,6 @@ jobs:
2037
- name: Install sbt
2138
uses: sbt/setup-sbt@v1
2239
- uses: scalacenter/sbt-dependency-submission@v3
40+
with:
41+
configs-ignore: provided optional test TestJdk9 compile-internal runtime-internal pr-validation multi-jvm scala-tool scala-doc-tool
42+
modules-ignore: pekko-bench-jmh_2.12 pekko-docs_2.12 pekko-bench-jmh_2.13 pekko-docs_2.13 pekko-bench-jmh_3 pekko-docs_3

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

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
name: Scalafmt
219

320
permissions: {}

Diff for: ‎.github/workflows/generate-doc-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ jobs:
5353
5454
- name: Compile testClass&docs for all Scala versions
5555
env:
56-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
56+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5757
run: sbt ";+TestJdk9 / compile ; +compile:doc"

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

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
name: Headers
219

320
on:
@@ -27,7 +44,7 @@ jobs:
2744

2845
- name: Check headers
2946
env:
30-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
47+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3148
run: |-
3249
sbt \
3350
-Dsbt.override.build.repos=false \

Diff for: ‎.github/workflows/link-validator.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# license agreements; and to You under the Apache License, version 2.0:
3+
#
4+
# https://www.apache.org/licenses/LICENSE-2.0
5+
#
6+
# This file is part of the Apache Pekko project, which was derived from Akka.
7+
#
8+
19
name: Link Validator
210

311
permissions: {}
412

513
on:
6-
pull_request:
714
workflow_dispatch:
815
schedule:
9-
- cron: '0 6 * * 1'
16+
- cron: '0 6 * * *'
1017

1118
jobs:
1219
validate-links:
@@ -39,7 +46,7 @@ jobs:
3946

4047
- name: Create the Pekko site
4148
env:
42-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
49+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4350
run: |-
4451
cp .jvmopts-ci .jvmopts
4552
sbt -Dpekko.genjavadoc.enabled=true -Dpekko.genlicensereport.enabled=true "Javaunidoc/doc; Compile/unidoc; docs/paradox"

Diff for: ‎.github/workflows/nightly-1.0-builds.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# license agreements; and to You under the Apache License, version 2.0:
3+
#
4+
# https://www.apache.org/licenses/LICENSE-2.0
5+
#
6+
# This file is part of the Apache Pekko project, which was derived from Akka.
7+
#
8+
19
name: Nightly Builds (1.0)
210

311
on:
412
schedule:
5-
- cron: "0 0 * * *"
13+
- cron: "0 0 * * 0"
614
workflow_dispatch:
715

816
permissions: {}
@@ -37,7 +45,7 @@ jobs:
3745

3846
- name: sbt cluster-metrics/test
3947
env:
40-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
48+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4149
run: |-
4250
sbt \
4351
-Djava.security.egd=file:/dev/./urandom \
@@ -91,7 +99,7 @@ jobs:
9199

92100
- name: sbt ${{ matrix.command }}
93101
env:
94-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
102+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
95103
# note that this is not running any multi-jvm tests because multi-in-test=false
96104
run: |-
97105
sbt \
@@ -141,7 +149,7 @@ jobs:
141149

142150
- name: Compile and Test
143151
env:
144-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
152+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
145153
# note that this is not running any multi-jvm tests because multi-in-test=false
146154
run: |-
147155
sbt \

0 commit comments

Comments
 (0)