From 53cc2889d161b847ee993dad806b35d3bebd29f9 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:11:01 -0700 Subject: [PATCH 01/17] Update Github actions --- .github/workflows/workflow.yml | 107 +++++++++++---------------------- 1 file changed, 35 insertions(+), 72 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c1e8583c9..bcd012323 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -4,26 +4,20 @@ name: xrpl4j-CI on: push: pull_request: - types: [assigned] + types: [ assigned ] jobs: build_java8: runs-on: ubuntu-20.04 steps: # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Java 8 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.8 - - name: Cache mvn dependencies - uses: actions/cache@v2 - env: - cache-name: mvn-deps - with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- + distribution: 'adopt' + java-version: '1.8' + cache: 'maven' - name: Build run: mvn dependency:go-offline install - name: Upload to Codecov @@ -36,12 +30,12 @@ jobs: runs-on: ubuntu-20.04 steps: # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Android - name: Setup Android SDK - uses: android-actions/setup-android@v2 + uses: android-actions/setup-android@v3 - name: Cache mvn dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 env: cache-name: mvn-deps with: @@ -56,44 +50,31 @@ jobs: strategy: matrix: # test against each major Java version - java: [ 9, 10, 11, 12, 13, 14, 15, 16, 17 ] + java: [ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 ] steps: # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Java version - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'adopt' java-version: ${{ matrix.java }} - - name: Cache mvn dependencies - uses: actions/cache@v2 - env: - cache-name: mvn-deps - with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- + cache: 'maven' - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true build_open_jdk_non_us: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Adopt OpenJDK Hotspot 16 - name: Set up OpenJDK 16 - uses: actions/setup-java@v1 - with: - distribution: adopt - java-version: 16 - - name: Cache mvn dependencies - uses: actions/cache@v2 - env: - cache-name: mvn-deps + uses: actions/setup-java@v4 with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- + distribution: 'adopt' + java-version: 21 + cache: 'maven' # Maven install with JVM locale = de_DE - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DargLine="-Duser.language=de -Duser.country=DE" @@ -102,20 +83,14 @@ jobs: runs-on: ubuntu-20.04 steps: # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Java 8 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.8 - - name: Cache mvn dependencies - uses: actions/cache@v2 - env: - cache-name: mvn-deps - with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- + distribution: 'adopt' + java-version: '1.8' + cache: 'maven' - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseDevnet @@ -123,39 +98,27 @@ jobs: runs-on: ubuntu-20.04 steps: # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Java 8 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache mvn dependencies - uses: actions/cache@v2 - env: - cache-name: mvn-deps + uses: actions/setup-java@v4 with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- + distribution: 'adopt' + java-version: '1.8' + cache: 'maven' # setup-java v4 includes maven caching - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseTestnet build_testnet_clio_its: runs-on: ubuntu-20.04 steps: # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set up Java 8 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache mvn dependencies - uses: actions/cache@v2 - env: - cache-name: mvn-deps + uses: actions/setup-java@v4 with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- + distribution: 'adopt' + java-version: '1.8' + cache: 'maven' - name: Build - run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseClioTestnet -DuseClioMainnet \ No newline at end of file + run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseClioTestnet -DuseClioMainnet From a18e522f42b3798834456431b143f6851906b2e4 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:12:42 -0700 Subject: [PATCH 02/17] Fix Java 8 version --- .github/workflows/workflow.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index bcd012323..541221376 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -12,11 +12,11 @@ jobs: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 # Set up Java 8 - - name: Set up JDK 1.8 + - name: Set up JDK 8 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '1.8' + java-version: '8' cache: 'maven' - name: Build run: mvn dependency:go-offline install @@ -85,11 +85,11 @@ jobs: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 # Set up Java 8 - - name: Set up JDK 1.8 + - name: Set up JDK 8 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '1.8' + java-version: '8' cache: 'maven' - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseDevnet @@ -100,11 +100,11 @@ jobs: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 # Set up Java 8 - - name: Set up JDK 1.8 + - name: Set up JDK 8 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '1.8' + java-version: '8' cache: 'maven' # setup-java v4 includes maven caching - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseTestnet @@ -114,11 +114,11 @@ jobs: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 # Set up Java 8 - - name: Set up JDK 1.8 + - name: Set up JDK 8 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '1.8' + java-version: '8' cache: 'maven' - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseClioTestnet -DuseClioMainnet From 8248fe92efe689b658a660a1400571a2e0d746a4 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:14:25 -0700 Subject: [PATCH 03/17] Fix Android build --- .github/workflows/workflow.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 541221376..a60020bed 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -31,17 +31,16 @@ jobs: steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 + # Set up Java 17 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: '21' + cache: 'maven' # Set up Android - name: Setup Android SDK uses: android-actions/setup-android@v3 - - name: Cache mvn dependencies - uses: actions/cache@v4 - env: - cache-name: mvn-deps - with: - path: ~/.m2 - key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }} - restore-keys: ${{ env.cache-name }}- - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -Pandroid From 136f6cabb8e18f6a1012b6c8a9b1c6e0cd7cde7b Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:21:12 -0700 Subject: [PATCH 04/17] Update plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b93cc50d..3429b4969 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.5.0 + 0.7.0 true central From 3d4ac180b75f45d8e7fb22fd6494b44991768090 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:26:11 -0700 Subject: [PATCH 05/17] Update dependency to fix download error --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3429b4969..b75bfd2ac 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ 1.0.4 2.14.2 - 12.3 + 13.5 2.0.7 5.10.1 32.1.1-jre From fa94d4da078136e9167e1889de28b4a01f2d8a10 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:30:15 -0700 Subject: [PATCH 06/17] Revert version update --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b75bfd2ac..3b93cc50d 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ 1.0.4 2.14.2 - 13.5 + 12.3 2.0.7 5.10.1 32.1.1-jre @@ -505,7 +505,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.7.0 + 0.5.0 true central From cbec021846e0b327221c745c55eab7bf731eddec Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:31:21 -0700 Subject: [PATCH 07/17] Move to temurin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per `actions/setup-java`: “AdoptOpenJDK got moved to Eclipse Temurin and won't be updated anymore. It is highly recommended to migrate workflows from adopt and adopt-openj9, to temurin and semeru respectively, to keep receiving software and security updates.” --- .github/workflows/workflow.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a60020bed..f2bcae3a5 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '8' cache: 'maven' - name: Build @@ -35,7 +35,7 @@ jobs: - name: Set up JDK 21 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '21' cache: 'maven' # Set up Android @@ -57,7 +57,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: ${{ matrix.java }} cache: 'maven' - name: Build @@ -71,7 +71,7 @@ jobs: - name: Set up OpenJDK 16 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 21 cache: 'maven' # Maven install with JVM locale = de_DE @@ -87,7 +87,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '8' cache: 'maven' - name: Build @@ -102,7 +102,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '8' cache: 'maven' # setup-java v4 includes maven caching - name: Build @@ -116,7 +116,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '8' cache: 'maven' - name: Build From d4de89285b247fcc3ad2c5a9aa030ee03f7e380b Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:33:18 -0700 Subject: [PATCH 08/17] Try Oracle JVMs --- .github/workflows/workflow.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f2bcae3a5..72c4d5d22 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: '8' cache: 'maven' - name: Build @@ -35,7 +35,7 @@ jobs: - name: Set up JDK 21 uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: '21' cache: 'maven' # Set up Android @@ -57,7 +57,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: ${{ matrix.java }} cache: 'maven' - name: Build @@ -71,7 +71,7 @@ jobs: - name: Set up OpenJDK 16 uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: 21 cache: 'maven' # Maven install with JVM locale = de_DE @@ -87,7 +87,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: '8' cache: 'maven' - name: Build @@ -102,7 +102,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: '8' cache: 'maven' # setup-java v4 includes maven caching - name: Build @@ -116,7 +116,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'oracle' java-version: '8' cache: 'maven' - name: Build From 06bf0168b9c79d2987445f42810657cf926acd7a Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:36:22 -0700 Subject: [PATCH 09/17] Use supported versions --- .github/workflows/workflow.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 72c4d5d22..68f1985b6 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: '8' cache: 'maven' - name: Build @@ -35,7 +35,7 @@ jobs: - name: Set up JDK 21 uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: '21' cache: 'maven' # Set up Android @@ -49,7 +49,7 @@ jobs: strategy: matrix: # test against each major Java version - java: [ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 ] + java: [ 11, 15, 16, 17, 21, 23 ] steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 @@ -57,7 +57,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: ${{ matrix.java }} cache: 'maven' - name: Build @@ -67,11 +67,11 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - # Set up Adopt OpenJDK Hotspot 16 - - name: Set up OpenJDK 16 + # Set up Temurin 21 + - name: Set up OpenJDK 21 uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: 21 cache: 'maven' # Maven install with JVM locale = de_DE @@ -87,7 +87,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: '8' cache: 'maven' - name: Build @@ -102,7 +102,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: '8' cache: 'maven' # setup-java v4 includes maven caching - name: Build @@ -116,7 +116,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' java-version: '8' cache: 'maven' - name: Build From 685ebfa20d5470570db0436b1108416cec6559df Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:37:39 -0700 Subject: [PATCH 10/17] Remove v15 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 68f1985b6..7d61a9fb1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -49,7 +49,7 @@ jobs: strategy: matrix: # test against each major Java version - java: [ 11, 15, 16, 17, 21, 23 ] + java: [ 11, 16, 17, 21, 23 ] steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 From 130c172eb9e37b8f1fd164b2c1e1818fce25b9b3 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Tue, 18 Feb 2025 14:40:58 -0700 Subject: [PATCH 11/17] Remove v23 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7d61a9fb1..0ae2c97a7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -49,7 +49,7 @@ jobs: strategy: matrix: # test against each major Java version - java: [ 11, 16, 17, 21, 23 ] + java: [ 11, 16, 17, 21 ] steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 From fe77c8d95a79186f3e24bd7801ba35714af0913b Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Wed, 19 Feb 2025 11:39:22 -0700 Subject: [PATCH 12/17] Update Ubuntu version Fixes #599 --- .github/workflows/workflow.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0ae2c97a7..663c94204 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,13 +1,12 @@ name: xrpl4j-CI - on: push: pull_request: types: [ assigned ] jobs: - build_java8: - runs-on: ubuntu-20.04 + build_jdk_temurin_8: + runs-on: ubuntu-latest steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 @@ -27,7 +26,7 @@ jobs: fail_ci_if_error: true build_android: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 @@ -44,11 +43,11 @@ jobs: - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -Pandroid - build_other_java: - runs-on: ubuntu-20.04 + build_jdk_temurin_other: + runs-on: ubuntu-latest strategy: matrix: - # test against each major Java version + # test against each major Java version (Java 8 built separately above for codecov upload) java: [ 11, 16, 17, 21 ] steps: # Checks-out the repository under $GITHUB_WORKSPACE @@ -63,12 +62,12 @@ jobs: - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true - build_open_jdk_non_us: - runs-on: ubuntu-20.04 + build_jdk_temurin_non_us: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 # Set up Temurin 21 - - name: Set up OpenJDK 21 + - name: Set up Temurin v21 uses: actions/setup-java@v4 with: distribution: 'temurin' @@ -79,7 +78,7 @@ jobs: run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DargLine="-Duser.language=de -Duser.country=DE" build_devnet_its: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 @@ -94,7 +93,7 @@ jobs: run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseDevnet build_testnet_reporting_its: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 @@ -107,8 +106,9 @@ jobs: cache: 'maven' # setup-java v4 includes maven caching - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DuseTestnet + build_testnet_clio_its: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Checks-out the repository under $GITHUB_WORKSPACE - uses: actions/checkout@v4 From 773b46159576b827b75300f48b067347572ac1c5 Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Wed, 19 Feb 2025 11:41:16 -0700 Subject: [PATCH 13/17] Adjust order --- .github/workflows/workflow.yml | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 663c94204..5eb480615 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,24 +25,6 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true - build_android: - runs-on: ubuntu-latest - steps: - # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v4 - # Set up Java 17 - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '21' - cache: 'maven' - # Set up Android - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - - name: Build - run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -Pandroid - build_jdk_temurin_other: runs-on: ubuntu-latest strategy: @@ -77,6 +59,24 @@ jobs: - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DargLine="-Duser.language=de -Duser.country=DE" + build_android: + runs-on: ubuntu-latest + steps: + # Checks-out the repository under $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + # Set up Java 17 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + # Set up Android + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + - name: Build + run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -Pandroid + build_devnet_its: runs-on: ubuntu-latest steps: From eb8f136ace6887763c6a0a15b339aad7266ca7bf Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Wed, 19 Feb 2025 11:54:20 -0700 Subject: [PATCH 14/17] Add MacOS and other JDK distributions --- .github/workflows/workflow.yml | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5eb480615..2e6a681aa 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,6 +25,56 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true + build_jdk_temurin_8_mac: + runs-on: macos-latest + steps: + # Checks-out the repository under $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + # Set up Java 8 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '8' + cache: 'maven' + - name: Build + run: mvn dependency:go-offline install + - name: Upload to Codecov + uses: codecov/codecov-action@v3.1.0 + with: + token: ${{ secrets.CODECOV_TOKEN }} + fail_ci_if_error: true + + build_jdk_semeru_8: + runs-on: ubuntu-latest + steps: + # Checks-out the repository under $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + # Set up Java 8 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + distribution: 'semeru' + java-version: '8' + cache: 'maven' + - name: Build + run: mvn dependency:go-offline install + + build_jdk_zulu_8: + runs-on: ubuntu-latest + steps: + # Checks-out the repository under $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + # Set up Java 8 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '8' + cache: 'maven' + - name: Build + run: mvn dependency:go-offline install + build_jdk_temurin_other: runs-on: ubuntu-latest strategy: From 00915703a613b357419e55fe8d6780df25a6408c Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Wed, 19 Feb 2025 11:56:06 -0700 Subject: [PATCH 15/17] Fix YAML format --- .github/workflows/workflow.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 2e6a681aa..3abdefb15 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -60,20 +60,20 @@ jobs: - name: Build run: mvn dependency:go-offline install - build_jdk_zulu_8: - runs-on: ubuntu-latest - steps: - # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v4 - # Set up Java 8 - - name: Set up JDK 8 - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: '8' - cache: 'maven' - - name: Build - run: mvn dependency:go-offline install + build_jdk_zulu_8: + runs-on: ubuntu-latest + steps: + # Checks-out the repository under $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + # Set up Java 8 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '8' + cache: 'maven' + - name: Build + run: mvn dependency:go-offline install build_jdk_temurin_other: runs-on: ubuntu-latest From 1afbd201aabbd79f4f50de0e276aa87d5a928a2a Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Wed, 19 Feb 2025 11:57:58 -0700 Subject: [PATCH 16/17] Fix MacOS build --- .github/workflows/workflow.yml | 35 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3abdefb15..75246581f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,26 +25,6 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true - build_jdk_temurin_8_mac: - runs-on: macos-latest - steps: - # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v4 - # Set up Java 8 - - name: Set up JDK 8 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '8' - cache: 'maven' - - name: Build - run: mvn dependency:go-offline install - - name: Upload to Codecov - uses: codecov/codecov-action@v3.1.0 - with: - token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true - build_jdk_semeru_8: runs-on: ubuntu-latest steps: @@ -109,6 +89,21 @@ jobs: - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DargLine="-Duser.language=de -Duser.country=DE" + build_jdk_temurin_mac: + runs-on: macos-latest + steps: + # Checks-out the repository under $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + # Set up Java 21 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + - name: Build + run: mvn dependency:go-offline install + build_android: runs-on: ubuntu-latest steps: From 4263b86d5e1d94fa9d437a63e7a913df6aa1997d Mon Sep 17 00:00:00 2001 From: David Fuelling Date: Wed, 19 Feb 2025 12:12:23 -0700 Subject: [PATCH 17/17] Remove mac due to slow docker install --- .github/workflows/workflow.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 75246581f..0493ad8df 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -89,21 +89,6 @@ jobs: - name: Build run: mvn dependency:go-offline install -Dmaven.javadoc.skip=true -DargLine="-Duser.language=de -Duser.country=DE" - build_jdk_temurin_mac: - runs-on: macos-latest - steps: - # Checks-out the repository under $GITHUB_WORKSPACE - - uses: actions/checkout@v4 - # Set up Java 21 - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '21' - cache: 'maven' - - name: Build - run: mvn dependency:go-offline install - build_android: runs-on: ubuntu-latest steps: