Changeset 17970 in josm for trunk


Ignore:
Timestamp:
2021-07-09T02:08:51+02:00 (3 years ago)
Author:
Don-vip
Message:

see #21005 - Java 18 support in Linux scripts and Github actions

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/.github/workflows/ant-test.yml

    r17963 r17970  
    11name: Java CI Test
    22env:
    3   junit_platform_version: '1.7.0'
     3  junit_platform_version: '1.7.2'
    44  # ANT_HOME is also our ant version
    55  ANT_HOME: 'apache-ant-1.10.10'
    … …  
    2222      matrix:
    2323        # test against latest update of each major Java version, as well as specific updates of LTS versions:
    24         java: [8, 11, 16, 17-ea]
     24        java: [8, 11, 16, 17-ea, 18-ea]
    2525        os: [ubuntu-latest, macos-latest, windows-latest]
    2626        exclude:
    … …  
    4545
    4646      - name: Setup Java ${{ matrix.java }}
    47         uses: actions/setup-java@v1.4.3
     47        uses: actions/setup-java@v2
    4848        with:
     49          distribution: 'zulu'
    4950          java-version: ${{ matrix.java }}
    5051
    … …  
    8485      - name: Publish Test Report with action-junit-report
    8586        if: ${{ always() }}
    86         uses: mikepenz/action-junit-report@v1
     87        uses: mikepenz/action-junit-report@v2
    8788        with:
    8889          report_paths: 'test/report/TEST*.xml'
    89           github_token: ${{ secrets.GITHUB_TOKEN }}
     90          token: ${{ secrets.GITHUB_TOKEN }}

  • trunk/.github/workflows/ant.yml

    r17963 r17970  
    11name: Java CI Build
    22env:
    3   junit_platform_version: '1.7.0'
     3  junit_platform_version: '1.7.2'
    44  # ANT_HOME is also our ant version
    55  ANT_HOME: 'apache-ant-1.10.10'
    … …  
    7171      matrix:
    7272        # test against latest update of each major Java version, as well as specific updates of LTS versions:
    73         java: [8, 11, 16, 17-ea]
     73        java: [8, 11, 16, 17-ea, 18-ea]
    7474        os: [ubuntu-latest, macos-latest, windows-latest]
    7575        exclude:
    … …  
    9494
    9595      - name: Setup Java ${{ matrix.java }}
    96         uses: actions/setup-java@v1.4.3
     96        uses: actions/setup-java@v2
    9797        with:
     98          distribution: 'zulu'
    9899          java-version: ${{ matrix.java }}
    99100

  • trunk/native/linux/latest/usr/bin/josm-latest

    r17566 r17970  
    2626        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
    2727        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    28         # Development version
     28        # Development version(s)
    2929        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
     30        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
    3031fi
    3132# Undetermined version

  • trunk/native/linux/tested/usr/bin/josm

    r17566 r17970  
    2626        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
    2727        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    28         # Development version
     28        # Development version(s)
    2929        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
     30        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
    3031fi
    3132# Undetermined version
Note: See TracChangeset for help on using the changeset viewer.