Changeset 17493 in josm

Timestamp:

2021-02-17T22:19:27+01:00 (3 years ago)

Author:

stoecker

Message:

fix #20202 - add parameter for release builds with ant

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (2 diffs)
• build.xml (modified) (1 diff)

trunk/.github/workflows/ant.yml

@@ -122 +122 @@
           defaults write net.pornel.ImageOptim PngOutEnabled 1
           /Applications/ImageOptim.app/Contents/MacOS/ImageOptim resources/images
-      - name: Set Is-Local-Build
-        if: ${{ ! needs.createrelease.outputs.josm_prerelease }}
-        run: |
-          ant create-revision
-          sed -i.bak '/Is-Local-Build/d' resources/REVISION
       - name: Build with Ant
+        # Calls ant with -Dreleasebuild=true if we're a 'tested' build
         # Disables errorprone for Java 16
         # See https://github.com/google/error-prone/issues/1872
         run: |
+          if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then
+            ANT="${{ env.ANT_HOME }}/bin/ant"
+          else
+            ANT="${{ env.ANT_HOME }}/bin/ant -Dreleasebuild=true"
+          fi
           if [[ "x${{ matrix.java }}x" =~ x1[6-9](-ea)?x ]]; then
-            ${{ env.ANT_HOME }}/bin/ant -DnoErrorProne dist
+            $ANT -DnoErrorProne dist
           else
-            ${{ env.ANT_HOME }}/bin/ant dist
+            $ANT dist
           fi
       - name: Upload jar
         # Only run on matrix.headless to avoid double jars. They should be the same jars.
-        # uses `gh release upload` to avoid https://github.com/actions/upload-release-asset/issues/69
         if: ${{ always() && matrix.headless == 'true' }}
         id: upload-jar
@@ -149 +149 @@
           asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
           asset_content_type: application/java-archive
-        # run: |
-        #   cp dist/josm-custom.jar JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
-        #   gh release upload ${{ needs.createrelease.outputs.josm_release_tag }} JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
       - name: Test with Ant, headless ${{ matrix.headless }}
         if: ${{ needs.createrelease.outputs.josm_prerelease }}

trunk/build.xml

@@ -140 +140 @@
 # automatically generated by JOSM build.xml - do not edit
 Revision: ${version.entry.commit.revision}
-Is-Local-Build: true
 Build-Date: ${build.tstamp}
+</echo>
+        <echo unless:set="releasebuild" file="${resources.dir}/REVISION" append="true">
+        Is-Local-Build: true
 </echo>
     </target>