Changeset 17493 in josm for trunk/.github/workflows


Ignore:
Timestamp:
2021-02-17T22:19:27+01:00 (5 months ago)
Author:
stoecker
Message:

fix #20202 - add parameter for release builds with ant

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/.github/workflows/ant.yml

    r17490 r17493  
    122122          defaults write net.pornel.ImageOptim PngOutEnabled 1
    123123          /Applications/ImageOptim.app/Contents/MacOS/ImageOptim resources/images
    124       - name: Set Is-Local-Build
    125         if: ${{ ! needs.createrelease.outputs.josm_prerelease }}
    126         run: |
    127           ant create-revision
    128           sed -i.bak '/Is-Local-Build/d' resources/REVISION
    129124      - name: Build with Ant
     125        # Calls ant with -Dreleasebuild=true if we're a 'tested' build
    130126        # Disables errorprone for Java 16
    131127        # See https://github.com/google/error-prone/issues/1872
    132128        run: |
     129          if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then
     130            ANT="${{ env.ANT_HOME }}/bin/ant"
     131          else
     132            ANT="${{ env.ANT_HOME }}/bin/ant -Dreleasebuild=true"
     133          fi
    133134          if [[ "x${{ matrix.java }}x" =~ x1[6-9](-ea)?x ]]; then
    134             ${{ env.ANT_HOME }}/bin/ant -DnoErrorProne dist
     135            $ANT -DnoErrorProne dist
    135136          else
    136             ${{ env.ANT_HOME }}/bin/ant dist
     137            $ANT dist
    137138          fi
    138139      - name: Upload jar
    139140        # Only run on matrix.headless to avoid double jars. They should be the same jars.
    140         # uses `gh release upload` to avoid https://github.com/actions/upload-release-asset/issues/69
    141141        if: ${{ always() && matrix.headless == 'true' }}
    142142        id: upload-jar
     
    149149          asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
    150150          asset_content_type: application/java-archive
    151         # run: |
    152         #   cp dist/josm-custom.jar JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
    153         #   gh release upload ${{ needs.createrelease.outputs.josm_release_tag }} JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
    154151      - name: Test with Ant, headless ${{ matrix.headless }}
    155152        if: ${{ needs.createrelease.outputs.josm_prerelease }}
Note: See TracChangeset for help on using the changeset viewer.