[maven-jlink-plugin] branch ubuntu-actions created (now a1bda61)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] branch ubuntu-actions created (now a1bda61)

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

slachiewicz pushed a change to branch ubuntu-actions
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git.


      at a1bda61  Prepare to planned change to default Ubuntu version for Github Actions https://github.com/actions/virtual-environments/issues/1816

This branch includes the following new commits:

     new 94fa639  Revert "jdk8 with buildchain"
     new a1bda61  Prepare to planned change to default Ubuntu version for Github Actions https://github.com/actions/virtual-environments/issues/1816

The 2 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.


Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] 01/02: Revert "jdk8 with buildchain"

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

slachiewicz pushed a commit to branch ubuntu-actions
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit 94fa63933e4b3ac529c35701703dfea249085330
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Fri Nov 20 17:03:49 2020 +0100

    Revert "jdk8 with buildchain"
   
    This reverts commit cf0d2b45 - needs more work
---
 .github/workflows/maven.yml | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b34aaa3..a5850cc 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -42,43 +42,10 @@ jobs:
           restore-keys: |
             maven-${{ matrix.os }}-java${{ matrix.java }}-
             maven-${{ matrix.os }}-
-      - name: Set up Toolchain
-        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
-        uses: DamianReeves/write-file-action@v1.0
-        with:
-          path: it-toolchains.xml
-          contents: |
-            <?xml version="1.0" encoding="UTF8"?>
-            <toolchains>
-              <toolchain>
-                <type>jdk</type>
-                  <provides>
-                    <version>11</version>
-                    <vendor>adopt</vendor>
-                  </provides>
-                  <configuration>
-                    <jdkHome>$HOME/.jabba/jdk/adopt-openj9@1.11.0-7</jdkHome>
-                  </configuration>
-              </toolchain>
-            </toolchains>
-          write-mode: overwrite
-      - name: Install Toolchain JDK
-        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
-        uses: battila7/jdk-via-jabba@v1
-        with:
-          jdk: adopt-openj9@1.11.0-7
-      - name: delete jdk-via-jabba tmp dir
-        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
-        run: rm -rvf _temp/
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
-        if: ${{ matrix.java != '8' || matrix.os != 'ubuntu-latest' }}
         run: mvn verify -e -B -V -Prun-its
-      - name: Build with Maven and Toolchain
-        if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-latest' }}
-        run: mvn verify -e -B -V -Prun-its --global-toolchains it-toolchains.xml
-

Reply | Threaded
Open this post in threaded view
|

[maven-jlink-plugin] 02/02: Prepare to planned change to default Ubuntu version for Github Actions https://github.com/actions/virtual-environments/issues/1816

slachiewicz
In reply to this post by slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch ubuntu-actions
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git

commit a1bda61483d3732328d799dea5f6735989a026ce
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Fri Nov 20 17:06:35 2020 +0100

    Prepare to planned change to default Ubuntu version for Github Actions
    https://github.com/actions/virtual-environments/issues/1816
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a5850cc..f4fb733 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ 'Ubuntu-20.04', windows-latest ]
         java: [ 8, 11, 15 ]
       fail-fast: false