You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by jr...@apache.org on 2023/03/06 11:31:25 UTC
[incubator-pekko-http] branch revert-96-use-setup-java created (now f86964449)
This is an automated email from the ASF dual-hosted git repository.
jrudolph pushed a change to branch revert-96-use-setup-java
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
at f86964449 Revert "Use setup-java in Github Actions (#96)"
This branch includes the following new commits:
new f86964449 Revert "Use setup-java in Github Actions (#96)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
[incubator-pekko-http] 01/01: Revert "Use setup-java in Github Actions (#96)"
Posted by jr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jrudolph pushed a commit to branch revert-96-use-setup-java
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
commit f869644497d4dfc255d7743ea0f057b1541f7270
Author: Johannes Rudolph <jo...@gmail.com>
AuthorDate: Mon Mar 6 12:31:21 2023 +0100
Revert "Use setup-java in Github Actions (#96)"
This reverts commit 085e88fb3f2af71c9632c668afc80c0cda0ca722.
---
.github/workflows/headers.yml | 2 +-
.github/workflows/nightly.yml | 7 ++++---
.github/workflows/publish.yml | 15 +++++----------
.github/workflows/validate-and-test.yml | 12 +++++-------
.jvmopts-ci => .jvmopts-ghactions | 0
5 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml
index 21b3bc771..d990cac6f 100644
--- a/.github/workflows/headers.yml
+++ b/.github/workflows/headers.yml
@@ -23,7 +23,7 @@ jobs:
uses: coursier/cache-action@v6.4.0
- name: Enable jvm-opts
- run: cp .jvmopts-ci .jvmopts
+ run: cp .jvmopts-ghactions .jvmopts
- name: Check headers
run: sbt +headerCheckAll
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 46907881b..0b54bf627 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -23,10 +23,11 @@ jobs:
fetch-depth: 0
- name: Set up JDK ${{ matrix.JABBA_JDK }}
- uses: actions/setup-java@v3
+ uses: olafurpg/setup-scala@v10
+ env:
+ JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json'
with:
- distribution: temurin
- java-version: ${{ matrix.JABBA_JDK }}
+ java-version: temurin@${{ matrix.JABBA_JDK }}
- name: Cache Coursier cache
uses: coursier/cache-action@v6.2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c565e4528..7c2c2ff72 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,10 +17,9 @@ jobs:
fetch-depth: 0
- name: Set up JDK 8
- uses: actions/setup-java@v3
+ uses: olafurpg/setup-scala@v10
with:
- distribution: temurin
- java-version: 8
+ java-version: adopt@1.8
- name: Cache Coursier cache
uses: coursier/cache-action@v6.2
@@ -28,11 +27,8 @@ 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 +publish
+ run: sbt -jvm-opts .jvmopts-ghactions +publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PW: ${{ secrets.NEXUS_PW }}
@@ -48,10 +44,9 @@ jobs:
fetch-depth: 0
- name: Set up JDK 8
- uses: actions/setup-java@v3
+ uses: olafurpg/setup-scala@v10
with:
- distribution: temurin
- java-version: 8
+ java-version: adopt@1.8
- name: Cache Coursier cache
uses: coursier/cache-action@v6.2
diff --git a/.github/workflows/validate-and-test.yml b/.github/workflows/validate-and-test.yml
index b65b97f97..54b980972 100644
--- a/.github/workflows/validate-and-test.yml
+++ b/.github/workflows/validate-and-test.yml
@@ -21,10 +21,9 @@ jobs:
uses: actions/checkout@v2
- name: Set up Scala on JDK 8
- uses: actions/setup-java@v3
+ uses: olafurpg/setup-scala@v13
with:
- distribution: temurin
- java-version: 8
+ java-version: adopt@1.8
- name: Cache Coursier cache
uses: coursier/cache-action@v6.2
@@ -54,7 +53,7 @@ jobs:
fail-fast: false
matrix:
SCALA_VERSION: [2.12, 2.13]
- JABBA_JDK: [8, 11]
+ JABBA_JDK: [1.8, 1.11]
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -62,10 +61,9 @@ jobs:
fetch-depth: 0
- name: Set up JDK ${{ matrix.JABBA_JDK }}
- uses: actions/setup-java@v3
+ uses: olafurpg/setup-scala@v10
with:
- distribution: temurin
- java-version: ${{ matrix.JABBA_JDK }}
+ java-version: adopt@${{ matrix.JABBA_JDK }}
- name: Cache Coursier cache
uses: coursier/cache-action@v6.2
diff --git a/.jvmopts-ci b/.jvmopts-ghactions
similarity index 100%
rename from .jvmopts-ci
rename to .jvmopts-ghactions
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org