From ce889525cc7fd3a56964e5873804bf178349be53 Mon Sep 17 00:00:00 2001 From: AlyonaSviridenko Date: Tue, 2 Mar 2021 18:43:44 +0300 Subject: [PATCH 1/3] updated workflows with new version of setup-java --- ci/android.yml | 8 +++++--- ci/ant.yml | 7 ++++--- ci/gradle-publish.yml | 9 +++++---- ci/gradle.yml | 7 ++++--- ci/maven-publish.yml | 9 +++++---- ci/maven.yml | 7 ++++--- ci/scala.yml | 7 ++++--- 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/ci/android.yml b/ci/android.yml index 6954a61..3edebb5 100644 --- a/ci/android.yml +++ b/ci/android.yml @@ -13,10 +13,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 + - name: set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' + - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/ci/ant.yml b/ci/ant.yml index 28fe6d0..8b8a5ba 100644 --- a/ci/ant.yml +++ b/ci/ant.yml @@ -16,9 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' - name: Build with Ant run: ant -noinput -buildfile build.xml diff --git a/ci/gradle-publish.yml b/ci/gradle-publish.yml index cec487e..2faa3aa 100644 --- a/ci/gradle-publish.yml +++ b/ci/gradle-publish.yml @@ -1,5 +1,5 @@ # This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java#publishing-using-gradle +# For more information see: https://github.com/actions/setup-java/docs/advanced-usage.md#Publishing-using-gradle name: Gradle Package @@ -14,10 +14,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/ci/gradle.yml b/ci/gradle.yml index 4550f58..6ffdc6a 100644 --- a/ci/gradle.yml +++ b/ci/gradle.yml @@ -16,10 +16,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/ci/maven-publish.yml b/ci/maven-publish.yml index fb1c7ee..831b54b 100644 --- a/ci/maven-publish.yml +++ b/ci/maven-publish.yml @@ -1,5 +1,5 @@ # This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path +# For more information see: https://github.com/actions/setup-java/docs/advanced-usage.md#apache-maven-with-a-settings-path name: Maven Package @@ -14,10 +14,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/ci/maven.yml b/ci/maven.yml index a46556a..005184b 100644 --- a/ci/maven.yml +++ b/ci/maven.yml @@ -16,9 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/ci/scala.yml b/ci/scala.yml index 96bfc70..e650d8a 100644 --- a/ci/scala.yml +++ b/ci/scala.yml @@ -13,9 +13,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adoptium' - name: Run tests run: sbt test From f42ac9c022d58205b5936aa59a174f00962a7070 Mon Sep 17 00:00:00 2001 From: AlyonaSviridenko Date: Thu, 11 Mar 2021 12:56:09 +0300 Subject: [PATCH 2/3] renamed adoptium to adopt --- ci/android.yml | 2 +- ci/ant.yml | 2 +- ci/gradle-publish.yml | 2 +- ci/gradle.yml | 2 +- ci/maven-publish.yml | 2 +- ci/maven.yml | 2 +- ci/scala.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/android.yml b/ci/android.yml index 3edebb5..4bbc689 100644 --- a/ci/android.yml +++ b/ci/android.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/ci/ant.yml b/ci/ant.yml index 8b8a5ba..655a94c 100644 --- a/ci/ant.yml +++ b/ci/ant.yml @@ -20,6 +20,6 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' - name: Build with Ant run: ant -noinput -buildfile build.xml diff --git a/ci/gradle-publish.yml b/ci/gradle-publish.yml index 2faa3aa..e69fc09 100644 --- a/ci/gradle-publish.yml +++ b/ci/gradle-publish.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/ci/gradle.yml b/ci/gradle.yml index 6ffdc6a..6e7e922 100644 --- a/ci/gradle.yml +++ b/ci/gradle.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/ci/maven-publish.yml b/ci/maven-publish.yml index 831b54b..6538c9e 100644 --- a/ci/maven-publish.yml +++ b/ci/maven-publish.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/ci/maven.yml b/ci/maven.yml index 005184b..923425b 100644 --- a/ci/maven.yml +++ b/ci/maven.yml @@ -20,6 +20,6 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/ci/scala.yml b/ci/scala.yml index e650d8a..4a3c112 100644 --- a/ci/scala.yml +++ b/ci/scala.yml @@ -17,6 +17,6 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adoptium' + distribution: 'adopt' - name: Run tests run: sbt test From 1f729c2f025d52b5407657a3fe8130bec1353717 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Mon, 5 Apr 2021 17:44:33 +0300 Subject: [PATCH 3/3] Fixed docs path Co-authored-by: Konrad Pabjan --- ci/gradle-publish.yml | 2 +- ci/maven-publish.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/gradle-publish.yml b/ci/gradle-publish.yml index e69fc09..ef99e13 100644 --- a/ci/gradle-publish.yml +++ b/ci/gradle-publish.yml @@ -1,5 +1,5 @@ # This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/docs/advanced-usage.md#Publishing-using-gradle +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle name: Gradle Package diff --git a/ci/maven-publish.yml b/ci/maven-publish.yml index 6538c9e..c3f4855 100644 --- a/ci/maven-publish.yml +++ b/ci/maven-publish.yml @@ -1,5 +1,5 @@ # This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/docs/advanced-usage.md#apache-maven-with-a-settings-path +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path name: Maven Package @@ -28,4 +28,4 @@ jobs: - name: Publish to GitHub Packages Apache Maven run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml env: - GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file + GITHUB_TOKEN: ${{ github.token }}