From f8c95e18a995e9c0197e7343dbedefc83ee7d839 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:29:54 +0100
Subject: [PATCH 1/2] simplify scala 3 build in CI

---
 .github/workflows/scala3-build.yml   | 31 +--------------
 .github/workflows/scala3-compile.yml | 57 ----------------------------
 2 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 .github/workflows/scala3-compile.yml

diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml
index bb9e8850ae7..1a55cf29891 100644
--- a/.github/workflows/scala3-build.yml
+++ b/.github/workflows/scala3-build.yml
@@ -18,19 +18,6 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.repository == 'apache/pekko'
     strategy:
-      matrix:
-        command:
-          - ;testkit/test;actor-tests/test
-          - ;actor-testkit-typed/test;actor-typed-tests/test
-          - ;bench-jmh/test
-          - ;cluster/test;cluster-tools/test;cluster-typed/test;distributed-data/test;cluster-metrics/test;cluster-sharding/test;cluster-sharding-typed/test
-          - ;discovery/test;coordination/test
-          - ;persistence/test;persistence-shared/test;persistence-query/test;persistence-typed/test;persistence-testkit/test;persistence-tck/test;persistence-typed-tests/test
-          - ;pki/test;slf4j/test
-          - ;serialization-jackson/test
-          - ;stream/test;stream-testkit/test;stream-tests/test;stream-typed/test;stream-typed-tests/test
-          - ;stream-tests-tck/test
-          - ;remote/test;remote-tests/test;protobuf-v3/test
       fail-fast: true
     steps:
       - name: Checkout
@@ -66,20 +53,4 @@ jobs:
           -Dmultinode.Xms256M \
           -Dmultinode.Xmx256M \
           -Dmultinode.XX:+AlwaysActAsServerClassMachine \
-          "++ 3.x ${{ matrix.command }}"
-
-      # comment out email actions until we have an email address to use (and we need to get INFRA to whitelist dawidd6/action-send-mail)
-      #- name: Email on failure
-      #  if: ${{ failure() }}
-      #  uses: dawidd6/action-send-mail@v3
-      #  with:
-      #    server_address: smtp.gmail.com
-      #    server_port: 465
-      #    username: ${{secrets.MAIL_USERNAME}}
-      #    password: ${{secrets.MAIL_PASSWORD}}
-      #    subject: "Failed: ${{ github.workflow }} / ${{ github.job }}"
-      #    to: akka.official@gmail.com
-      #    from: Akka CI (GHActions)
-      #    body: |
-      #      Job ${{ github.job }} in workflow ${{ github.workflow }} of ${{github.repository}} failed!
-      #      https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+          "++ 3.x test"
diff --git a/.github/workflows/scala3-compile.yml b/.github/workflows/scala3-compile.yml
deleted file mode 100644
index c4e5df0b2d1..00000000000
--- a/.github/workflows/scala3-compile.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Compile Pekko with Scala 3
-
-on:
-  pull_request:
-
-permissions: {}
-
-concurrency:
-  # Only run once for latest commit per ref and cancel other (previous) runs.
-  group: ci-scala3-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  compile:
-    name: Compile
-    runs-on: ubuntu-20.04
-    if: github.repository == 'apache/pekko'
-    strategy:
-      matrix:
-        command:
-          - ;testkit/Test/compile;actor-tests/Test/compile
-          - ;actor-testkit-typed/Test/compile;actor-typed-tests/Test/compile
-          - ;bench-jmh/Test/compile
-          - ;cluster/Test/compile;cluster-tools/Test/compile;cluster-typed/Test/compile;distributed-data/Test/compile;cluster-metrics/Test/compile;cluster-sharding/Test/compile;cluster-sharding-typed/Test/compile
-          - ;discovery/Test/compile;coordination/Test/compile
-          - ;persistence/Test/compile;persistence-shared/Test/compile;persistence-query/Test/compile;persistence-typed/Test/compile;persistence-testkit/Test/compile;persistence-tck/Test/compile;persistence-typed-tests/Test/compile
-          - ;pki/Test/compile;slf4j/Test/compile
-          - ;serialization-jackson/Test/compile
-          - ;stream/Test/compile;stream-testkit/Test/compile;stream-tests/Test/compile;stream-typed/Test/compile
-          - ;stream-tests-tck/Test/compile
-          - ;remote/Test/compile;remote-tests/Test/compile;protobuf-v3/Test/compile
-      fail-fast: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Setup Java 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 11
-
-      - name: Cache Coursier cache
-        uses: coursier/cache-action@v6
-
-      - name: Enable jvm-opts
-        run: cp .jvmopts-ci .jvmopts
-
-      - name: Compile on Scala 3
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-        run: |
-          sbt \
-          "++ 3.x ${{ matrix.command }}"

From 1e6db2735303b7344f28ccb506184bf02d54fe40 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:40:47 +0100
Subject: [PATCH 2/2] Update scala3-build.yml

---
 .github/workflows/scala3-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml
index 1a55cf29891..b3e8a31a580 100644
--- a/.github/workflows/scala3-build.yml
+++ b/.github/workflows/scala3-build.yml
@@ -3,6 +3,7 @@ name: Build and test Pekko with Scala 3
 on:
   schedule:
     - cron: "0 0 * * *"
+  pull_request:
   workflow_dispatch:
 
 permissions: {}