Changeset 18670 in josm


Ignore:
Timestamp:
2023-02-20T22:41:26+01:00 (2 years ago)
Author:
taylor.smock
Message:

Fix #22753: Fix GitHub Actions

This uses actions from ​https://github.com/JOSM/JOSMPluginAction, updates
other external actions and fixes many deprecation warnings.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r18488 r18670  
    22env:
    33  junit_platform_version: '1.7.2'
    4   # ANT_HOME is also our ant version
    5   ANT_HOME: 'apache-ant-1.10.12'
    64on:
    75  - push
    … …  
    2725    steps:
    2826      - name: Checkout
    29         uses: actions/checkout@v2
     27        uses: actions/checkout@v3
    3028        with:
    3129          fetch-depth: 256
    3230
    3331      - name: Cache
    34         uses: actions/cache@v2.0.0
     32        uses: actions/cache@v3
    3533        with:
    3634          path: |
    … …  
    4038
    4139      - name: Setup Java ${{ matrix.java }}
    42         uses: actions/setup-java@v2
     40        uses: actions/setup-java@v3
    4341        with:
    4442          distribution: 'zulu'
    4543          java-version: ${{ matrix.java }}
    4644
    47       - name: Install Ant ${{ env.ANT_HOME }}
    48         run: |
    49           if [ ! -f tools/${{ env.ANT_HOME }}-bin.tar.gz ]; then
    50             curl -o tools/${{ env.ANT_HOME }}-bin.tar.gz https://downloads.apache.org/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz
    51           fi
    52           tar zxf tools/${{ env.ANT_HOME }}-bin.tar.gz
    53 
    54       - name: Ant diagnostics
    55         run: ${{ env.ANT_HOME }}/bin/ant -diagnostics
     45      - name: Install Ant
     46        uses: JOSM/JOSMPluginAction/actions/setup-ant@v1
    5647
    5748      - name: Test with Ant
    5849        run: |
    59           ANT="${{ env.ANT_HOME }}/bin/ant -DnoJavaFX=true test-unit-hardfail"
     50          ANT="ant -DnoJavaFX=true test-unit-hardfail"
    6051          $ANT -Dtest.headless=true
    6152
    … …  
    6657      - name: Upload Ant reports
    6758        if: ${{ always() }}
    68         uses: actions/upload-artifact@v2
     59        uses: actions/upload-artifact@v3
    6960        with:
    7061          name: Ant reports for JOSM ${{ needs.createrelease.outputs.josm_revision }} on java ${{ matrix.java }} on ${{ matrix.os }}
    … …  
    8273    steps:
    8374      - name: Download Artifacts
    84         uses: actions/download-artifact@v2
     75        uses: actions/download-artifact@v3
    8576        with:
    8677          path: artifacts
    … …  
    8879      - name: Publish Test Report with action-junit-report
    8980        if: ${{ always() }}
    90         uses: mikepenz/action-junit-report@v2
     81        uses: mikepenz/action-junit-report@v3
    9182        with:
    9283          report_paths: 'artifacts/**/*.xml'
    … …  
    9485
    9586      - name: Publish Test Report with publish-unit-test-result-action
    96         uses: EnricoMi/publish-unit-test-result-action@v1
     87        uses: EnricoMi/publish-unit-test-result-action@v2
    9788        with:
    9889          files: 'artifacts/**/*.xml'

  • trunk/.github/workflows/ant.yml

    r18531 r18670  
    22env:
    33  junit_platform_version: '1.7.2'
    4   # ANT_HOME is also our ant version
    5   ANT_HOME: 'apache-ant-1.10.12'
    64  JAVAFX_VERSION: '17.0.2'
    75on:
    … …  
    2725    steps:
    2826      - name: Checkout
    29         uses: actions/checkout@v2
     27        uses: actions/checkout@v3
    3028        with:
    3129          fetch-depth: 256
    … …  
    3836          if [[ "$josm_revision" == "$(curl --silent https://josm.openstreetmap.de/tested)" ]]; then
    3937            echo "josm_prerelease=false" >> $GITHUB_ENV
    40             echo "::set-output name=josm_prerelease::false"
     38            echo "josm_prerelease=false" >> $GITHUB_OUTPUT
    4139            josm_release_tag=$josm_revision-tested
    4240          else
    4341            echo "josm_prerelease=true" >> $GITHUB_ENV
    44             echo "::set-output name=josm_prerelease::true"
     42            echo "josm_prerelease=true" >> $GITHUB_OUTPUT
    4543            josm_release_tag=$josm_revision
    4644          fi
    4745          echo "josm_revision=$josm_revision" >> $GITHUB_ENV
    48           echo "::set-output name=josm_revision::$josm_revision"
     46          echo "josm_revision=$josm_revision" >> $GITHUB_OUTPUT
    4947          echo "josm_release_tag=$josm_release_tag" >> $GITHUB_ENV
    50           echo "::set-output name=josm_release_tag::$josm_release_tag"
     48          echo "josm_release_tag=$josm_release_tag" >> $GITHUB_OUTPUT
    5149
    5250      - name: Create release
    … …  
    7775    steps:
    7876      - name: Checkout
    79         uses: actions/checkout@v2
     77        uses: actions/checkout@v3
    8078        with:
    8179          fetch-depth: 256
    8280
    8381      - name: Cache
    84         uses: actions/cache@v2.0.0
     82        uses: actions/cache@v3
    8583        with:
    8684          path: |
    … …  
    9088
    9189      - name: Setup Java ${{ matrix.java }}
    92         uses: actions/setup-java@v2
     90        uses: actions/setup-java@v3
    9391        with:
    9492          distribution: 'zulu'
    9593          java-version: ${{ matrix.java }}
    9694
    97       - name: Install Ant ${{ env.ANT_HOME }}
    98         run: |
    99           if [ ! -f tools/${{ env.ANT_HOME }}-bin.tar.gz ]; then
    100             curl -o tools/${{ env.ANT_HOME }}-bin.tar.gz https://downloads.apache.org/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz
    101           fi
    102           tar zxf tools/${{ env.ANT_HOME }}-bin.tar.gz
    103 
    104       - name: Ant diagnostics
    105         run: ${{ env.ANT_HOME }}/bin/ant -diagnostics
     95      - name: Install Ant
     96        uses: JOSM/JOSMPluginAction/actions/setup-ant@v1
    10697
    10798      - name: Optimise images
    … …  
    126117          echo "$SIGN_CERT" | base64 --decode > $SIGN_KEYSTORE
    127118          if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then
    128             ANT="${{ env.ANT_HOME }}/bin/ant"
     119            ANT="ant"
    129120          else
    130             ANT="${{ env.ANT_HOME }}/bin/ant -Dreleasebuild=true"
     121            ANT="ant -Dreleasebuild=true"
    131122          fi
    132123          $ANT dist

  • trunk/.github/workflows/checkstyle-analysis.yml

    r18057 r18670  
    1515    steps:
    1616    - name: Checkout repository
    17       uses: actions/checkout@v2
     17      uses: actions/checkout@v3
    1818      with:
    1919          fetch-depth: 256
    2020
    2121    - name: Cache
    22       uses: actions/cache@v2.0.0
     22      uses: actions/cache@v3
    2323      with:
    2424        path: |
    … …  
    3232
    3333    - name: Upload report
    34       uses: actions/upload-artifact@v2
     34      uses: actions/upload-artifact@v3
    3535      with:
    3636        path: checkstyle-josm.xml
    3737
    38     - uses: jwgmeligmeyling/checkstyle-github-action@master
     38    - uses: JOSM/JOSMPluginAction/actions/checkstyle@v1
    3939      with:
    40         path: '**/checkstyle-josm.xml'
     40        file: "checkstyle-josm.xml"

  • trunk/.github/workflows/codeql-analysis.yml

    r18056 r18670  
    2222    steps:
    2323    - name: Checkout repository
    24       uses: actions/checkout@v2
     24      uses: actions/checkout@v3
    2525      with:
    2626          fetch-depth: 256
    2727
    2828    - name: Cache
    29       uses: actions/cache@v2.0.0
     29      uses: actions/cache@v3
    3030      with:
    3131        path: |
    … …  
    3535
    3636    - name: Initialize CodeQL
    37       uses: github/codeql-action/init@v1
     37      uses: github/codeql-action/init@v2
    3838      with:
    3939        languages: ${{ matrix.language }}
    … …  
    4444
    4545    - name: Perform CodeQL Analysis
    46       uses: github/codeql-action/analyze@v1
     46      uses: github/codeql-action/analyze@v2

  • trunk/.github/workflows/pmd-analysis.yml

    r18057 r18670  
    1515    steps:
    1616    - name: Checkout repository
    17       uses: actions/checkout@v2
     17      uses: actions/checkout@v3
    1818      with:
    1919          fetch-depth: 256
    2020
    2121    - name: Cache
    22       uses: actions/cache@v2.0.0
     22      uses: actions/cache@v3
    2323      with:
    2424        path: |
    … …  
    3232
    3333    - name: Upload report
    34       uses: actions/upload-artifact@v2
     34      uses: actions/upload-artifact@v3
    3535      with:
    3636        path: pmd-josm.xml
    3737
    38     - uses: jwgmeligmeyling/pmd-github-action@master
     38    - uses: JOSM/JOSMPluginAction/actions/pmd@v1
    3939      with:
    40         path: '**/pmd-josm.xml'
     40        src: 'src'
     41        file: "pmd-josm.xml"

  • trunk/.github/workflows/spotbugs-analysis.yml

    r18064 r18670  
    1515    steps:
    1616    - name: Checkout repository
    17       uses: actions/checkout@v2
     17      uses: actions/checkout@v3
    1818      with:
    1919          fetch-depth: 256
    2020
    2121    - name: Cache
    22       uses: actions/cache@v2.0.0
     22      uses: actions/cache@v3
    2323      with:
    2424        path: |
    … …  
    3232
    3333    - name: Upload report
    34       uses: actions/upload-artifact@v2
     34      uses: actions/upload-artifact@v3
    3535      with:
    3636        path: spotbugs-josm.xml

  • trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java

    r18669 r18670  
    139139                Arguments.of("MainApplication.worker", (Consumer<Runnable>) runnable -> {
    140140                    MainApplication.worker.execute(runnable);
    141                     assertDoesNotThrow(() -> MainApplication.worker.submit(() -> { /* Sync thread */}).get(1, TimeUnit.SECONDS));
     141                    assertDoesNotThrow(() -> MainApplication.worker.submit(() -> { /* Sync thread */ }).get(1, TimeUnit.SECONDS));
    142142                })
    143143        );
Note: See TracChangeset for help on using the changeset viewer.