This is an automated email from the ASF dual-hosted git repository.

jrudolph pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git


The following commit(s) were added to refs/heads/main by this push:
     new 262b8c433 Use setup-java in Github Actions (#96) (#113)
262b8c433 is described below

commit 262b8c433130966860c6f3bb8891557f5124bde2
Author: Johannes Rudolph <[email protected]>
AuthorDate: Mon Mar 6 14:18:52 2023 +0100

    Use setup-java in Github Actions (#96) (#113)
    
    Co-authored-by: Matthew de Detrich <[email protected]>
---
 .github/workflows/headers.yml              |  2 +-
 .github/workflows/nightly.yml              | 18 ++++++++++--------
 .github/workflows/publish-test-reports.yml |  6 +++---
 .github/workflows/publish.yml              | 18 +++++++++++++-----
 .github/workflows/validate-and-test.yml    | 23 ++++++++++++++---------
 .jvmopts-ghactions => .jvmopts-ci          |  3 +--
 6 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml
index d990cac6f..21b3bc771 100644
--- a/.github/workflows/headers.yml
+++ b/.github/workflows/headers.yml
@@ -23,7 +23,7 @@ jobs:
         uses: coursier/[email protected]
 
       - name: Enable jvm-opts
-        run: cp .jvmopts-ghactions .jvmopts
+        run: cp .jvmopts-ci .jvmopts
 
       - name: Check headers
         run: sbt +headerCheckAll
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 0b54bf627..b996bf2a9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         SCALA_VERSION: [2.12, 2.13]
-        JABBA_JDK: [8, 11, 17]
+        JDK: [8, 11, 17]
         PEKKO_VERSION: [default]
     steps:
       - name: Checkout
@@ -22,12 +22,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK ${{ matrix.JABBA_JDK }}
-        uses: olafurpg/setup-scala@v10
-        env:
-          JABBA_INDEX: 
'https://github.com/typelevel/jdk-index/raw/main/index.json'
+      - name: Set up JDK ${{ matrix.JDK }}
+        uses: actions/setup-java@v3
         with:
-          java-version: temurin@${{ matrix.JABBA_JDK }}
+          distribution: temurin
+          java-version: ${{ matrix.JDK }}
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
@@ -38,15 +37,18 @@ jobs:
           path: project/**/target
           key: build-target-${{ hashFiles('**/*.sbt', 
'project/build.properties', 'project/**/*.scala') }}
 
+      - name: Enable jvm-opts
+        run: cp .jvmopts-ci .jvmopts
+
       - name: Compile everything
         run: sbt -Dpekko.http.build.pekko.version=${{ matrix.PEKKO_VERSION }} 
++${{ matrix.SCALA_VERSION }} Test/compile
 
-      - name: Run all tests JDK ${{ matrix.JABBA_JDK }}, Scala ${{ 
matrix.SCALA_VERSION }}, Akka ${{ matrix.PEKKO_VERSION }}
+      - name: Run all tests JDK ${{ matrix.JDK }}, Scala ${{ 
matrix.SCALA_VERSION }}, Akka ${{ matrix.PEKKO_VERSION }}
         run: sbt -Dpekko.http.parallelExecution=false -Dakka.test.timefactor=2 
-Dpekko.http.build.pekko.version=${{ matrix.PEKKO_VERSION }} ++${{ 
matrix.SCALA_VERSION }} mimaReportBinaryIssues test
 
       - name: Upload test results
         uses: actions/upload-artifact@v2  # upload test results
         if: success() || failure()        # run this step even if previous 
step failed
         with:
-          name: test-results-${{ matrix.JABBA_JDK }}-${{ matrix.SCALA_VERSION 
}}-${{ matrix.PEKKO_VERSION }}
+          name: test-results-${{ matrix.JDK }}-${{ matrix.SCALA_VERSION }}-${{ 
matrix.PEKKO_VERSION }}
           path: '**/target/test-reports/*.xml'
diff --git a/.github/workflows/publish-test-reports.yml 
b/.github/workflows/publish-test-reports.yml
index 27dde4670..54842cac8 100644
--- a/.github/workflows/publish-test-reports.yml
+++ b/.github/workflows/publish-test-reports.yml
@@ -13,14 +13,14 @@ jobs:
       fail-fast: false
       matrix:
         SCALA_VERSION: [ 2.12, 2.13 ]
-        JABBA_JDK: [ 1.8, 1.11 ]
+        JDK: [ 8, 11 ]
     steps:
       - uses: dorny/test-reporter@v1
         # avoid excessive notification spam, fail-on-error seems broken 
https://github.com/dorny/test-reporter/issues/161
         continue-on-error: true
         with:
-          artifact: test-results-${{ matrix.JABBA_JDK }}-${{ 
matrix.SCALA_VERSION }}
-          name: Test Results Details / Scala ${{ matrix.SCALA_VERSION }} on 
JDK ${{ matrix.JABBA_JDK }}
+          artifact: test-results-${{ matrix.JDK }}-${{ matrix.SCALA_VERSION }}
+          name: Test Results Details / Scala ${{ matrix.SCALA_VERSION }} on 
JDK ${{ matrix.JDK }}
           fail-on-error: false
           path: '**/target/test-reports/*.xml'
           reporter: java-junit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7c2c2ff72..586003061 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,9 +17,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 8
-        uses: olafurpg/setup-scala@v10
+        uses: actions/setup-java@v3
         with:
-          java-version: [email protected]
+          distribution: temurin
+          java-version: 8
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
@@ -27,8 +28,11 @@ jobs:
       - name: Install graphviz
         run: sudo apt-get install -y graphviz
 
+      - name: Enable jvm-opts
+        run: cp .jvmopts-ci .jvmopts
+
       - name: Publish to Apache Maven repo
-        run: sbt -jvm-opts .jvmopts-ghactions +publish
+        run: sbt +publish
         env:
           NEXUS_USER: ${{ secrets.NEXUS_USER }}
           NEXUS_PW: ${{ secrets.NEXUS_PW }}
@@ -44,13 +48,17 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 8
-        uses: olafurpg/setup-scala@v10
+        uses: actions/setup-java@v3
         with:
-          java-version: [email protected]
+          distribution: temurin
+          java-version: 8
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
 
+      - name: Enable jvm-opts
+        run: cp .jvmopts-ci .jvmopts
+
       - name: Build Documentation
         run: |-
           sbt -Dpekko.genjavadoc.enabled=true docs/paradox unidoc
diff --git a/.github/workflows/validate-and-test.yml 
b/.github/workflows/validate-and-test.yml
index 54b980972..5e394ea3a 100644
--- a/.github/workflows/validate-and-test.yml
+++ b/.github/workflows/validate-and-test.yml
@@ -21,9 +21,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Scala on JDK 8
-        uses: olafurpg/setup-scala@v13
+        uses: actions/setup-java@v3
         with:
-          java-version: [email protected]
+          distribution: temurin
+          java-version: 8
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
@@ -53,17 +54,18 @@ jobs:
       fail-fast: false
       matrix:
         SCALA_VERSION: [2.12, 2.13]
-        JABBA_JDK: [1.8, 1.11]
+        JDK: [8, 11]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Set up JDK ${{ matrix.JABBA_JDK }}
-        uses: olafurpg/setup-scala@v10
+      - name: Set up JDK ${{ matrix.JDK }}
+        uses: actions/setup-java@v3
         with:
-          java-version: adopt@${{ matrix.JABBA_JDK }}
+          distribution: temurin
+          java-version: ${{ matrix.JDK }}
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
@@ -74,16 +76,19 @@ jobs:
           path: project/**/target
           key: build-target-${{ hashFiles('**/*.sbt', 
'project/build.properties', 'project/**/*.scala') }}
 
+      - name: Enable jvm-opts
+        run: cp .jvmopts-ci .jvmopts
+
       - name: Compile everything
         run: sbt ++${{ matrix.SCALA_VERSION }} Test/compile
 
       # Quick testing for PR validation
-      - name: Validate pull request for JDK ${{ matrix.JABBA_JDK }}, Scala ${{ 
matrix.SCALA_VERSION }}
+      - name: Validate pull request for JDK ${{ matrix.JDK }}, Scala ${{ 
matrix.SCALA_VERSION }}
         if: ${{ github.event_name == 'pull_request' }}
         run: sbt -Dpekko.http.parallelExecution=false -Dakka.test.timefactor=2 
++${{ matrix.SCALA_VERSION }} validatePullRequest
 
       # Full testing for pushes
-      - name: Run all tests JDK ${{ matrix.JABBA_JDK }}, Scala ${{ 
matrix.SCALA_VERSION }}
+      - name: Run all tests JDK ${{ matrix.JDK }}, Scala ${{ 
matrix.SCALA_VERSION }}
         if: ${{ github.event_name == 'push' }}
         run: sbt -Dpekko.http.parallelExecution=false -Dakka.test.timefactor=2 
++${{ matrix.SCALA_VERSION }} mimaReportBinaryIssues test
 
@@ -91,5 +96,5 @@ jobs:
         uses: actions/upload-artifact@v2  # upload test results
         if: success() || failure()        # run this step even if previous 
step failed
         with:
-          name: test-results-${{ matrix.JABBA_JDK }}-${{ matrix.SCALA_VERSION 
}}
+          name: test-results-${{ matrix.JDK }}-${{ matrix.SCALA_VERSION }}
           path: '**/target/test-reports/*.xml'
diff --git a/.jvmopts-ghactions b/.jvmopts-ci
similarity index 74%
rename from .jvmopts-ghactions
rename to .jvmopts-ci
index 4cefd4fdd..384134aea 100644
--- a/.jvmopts-ghactions
+++ b/.jvmopts-ci
@@ -1,6 +1,5 @@
 -verbose:gc
+-Xmx4g
 -Duser.language=en_US.UTF-8
 -Dfile.encoding=en_US.UTF-8
 -Dsun.jnu.encoding=UTF-8
--XX:ReservedCodeCacheSize=256m
-


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to