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 085e88fb3 Use setup-java in Github Actions (#96)
085e88fb3 is described below

commit 085e88fb3f2af71c9632c668afc80c0cda0ca722
Author: Matthew de Detrich <[email protected]>
AuthorDate: Mon Mar 6 12:22:30 2023 +0100

    Use setup-java in Github Actions (#96)
---
 .github/workflows/headers.yml           |  2 +-
 .github/workflows/nightly.yml           |  7 +++----
 .github/workflows/publish.yml           | 15 ++++++++++-----
 .github/workflows/validate-and-test.yml | 12 +++++++-----
 .jvmopts-ghactions => .jvmopts-ci       |  0
 5 files changed, 21 insertions(+), 15 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..46907881b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -23,11 +23,10 @@ jobs:
           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'
+        uses: actions/setup-java@v3
         with:
-          java-version: temurin@${{ matrix.JABBA_JDK }}
+          distribution: temurin
+          java-version: ${{ matrix.JABBA_JDK }}
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7c2c2ff72..c565e4528 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,9 +48,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]
diff --git a/.github/workflows/validate-and-test.yml 
b/.github/workflows/validate-and-test.yml
index 54b980972..b65b97f97 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,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         SCALA_VERSION: [2.12, 2.13]
-        JABBA_JDK: [1.8, 1.11]
+        JABBA_JDK: [8, 11]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -61,9 +62,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.JABBA_JDK }}
-        uses: olafurpg/setup-scala@v10
+        uses: actions/setup-java@v3
         with:
-          java-version: adopt@${{ matrix.JABBA_JDK }}
+          distribution: temurin
+          java-version: ${{ matrix.JABBA_JDK }}
 
       - name: Cache Coursier cache
         uses: coursier/[email protected]
diff --git a/.jvmopts-ghactions b/.jvmopts-ci
similarity index 100%
rename from .jvmopts-ghactions
rename to .jvmopts-ci


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

Reply via email to