Changeset 17690 in josm

Timestamp:

2021-03-30T10:27:14+02:00 (4 years ago)

Author:

simon04

Message:

see #20621 - GitHub Actions: formatting for readability

File:

• trunk/.github/workflows/ant.yml (modified) (15 diffs)

trunk/.github/workflows/ant.yml

@@ -15 +15 @@
 
 jobs:
+
   createrelease:
     name: Create Release
@@ -20 +21 @@
     env:
       LANG: en_US.UTF-8
-    outputs: 
+    outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       josm_revision: ${{ steps.create_revision.outputs.josm_revision }}
@@ -30 +31 @@
         with:
           fetch-depth: 256
+
       - name: Set revision env variable
         id: create_revision
@@ -48 +50 @@
           echo "josm_release_tag=$josm_release_tag" >> $GITHUB_ENV
           echo "::set-output name=josm_release_tag::$josm_release_tag"
+
       - name: Create release
         id: create_release
@@ -60 +63 @@
           draft: false
           prerelease: ${{ env.josm_prerelease }}
+
   build:
     needs: createrelease
@@ -87 +91 @@
         with:
           fetch-depth: 256
+
       - name: Cache
         uses: actions/cache@v2.0.0
         with:
-          path:  |
+          path: |
             ~/.ivy2/cache/
             ~/work/josm/josm/tools/
             build-tools-cache/
           key: ${{ runner.os }}-ivy2-${{ hashFiles('ivy.xml') }}
+
       - name: Setup java
         uses: actions/setup-java@v1.4.3
         with:
           java-version: ${{ matrix.java }}
+
       - name: Install ant ${{ env.ANT_HOME }} and junit ${{ env.junit_platform_version }}
         run: |
@@ -112 +119 @@
           tar zxf build-tools-cache/${{ env.ANT_HOME }}-bin.tar.gz
           cp build-tools-cache/junit-platform-console-standalone-${{ env.junit_platform_version }}.jar ${{ env.ANT_HOME }}/lib/junit-platform-console-standalone-${{ env.junit_platform_version }}.jar
+
       - name: Print ant version, expecting ${{ env.ANT_HOME }}
         run: ${{ env.ANT_HOME }}/bin/ant -version
+
       - name: Optimise images
         if: ${{ runner.os == 'macos' && always() }}
@@ -122 +131 @@
           defaults write net.pornel.ImageOptim PngOutEnabled 1
           /Applications/ImageOptim.app/Contents/MacOS/ImageOptim resources/images
+
       - name: Build with Ant
         # Calls ant with -Dreleasebuild=true if we're a 'tested' build
@@ -131 +141 @@
           fi
           $ANT dist
+
       - name: Upload jar
         # Only run on matrix.headless to avoid double jars. They should be the same jars.
@@ -143 +154 @@
           asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.jar
           asset_content_type: application/java-archive
+
       - name: Test with Ant, headless ${{ matrix.headless }}
         if: ${{ needs.createrelease.outputs.josm_prerelease }}
@@ -152 +164 @@
             xvfb-run $ANT -Dtest.headless=false
           fi
+
       - name: Dump errors if failed
         if: ${{ failure() }}
         run: "grep -L ', Failures: 0, Skipped: ' test/report/*.txt | xargs cat"
+
       - name: Upload Ant reports
         if: ${{ always() }}
@@ -161 +175 @@
           name: Ant reports for JOSM ${{ needs.createrelease.outputs.josm_revision }} on java ${{ matrix.java }} on ${{ matrix.os }} with headless=${{ matrix.headless }}
           path: test/report/*.txt
+
       - name: Publish Test Report with junit-report-annotations-action
         uses: ashley-taylor/junit-report-annotations-action@1.3
@@ -167 +182 @@
           access-token: ${{ secrets.GITHUB_TOKEN }}
           path: 'test/report/TEST*.xml'
+
       - name: Publish Test Report with action-junit-report
         if: always()
@@ -173 +189 @@
           report_paths: 'test/report/TEST*.xml'
           github_token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and package for macOS
         if: ${{ runner.os == 'macos' && always() }}
@@ -181 +198 @@
         run: |
           ./native/macosx/macos-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
+
       - name: Upload app
         if: ${{ runner.os == 'macos' && always() }}