Changeset 18670 in josm for trunk/.github/workflows/ant.yml

Timestamp:

2023-02-20T22:41:26+01:00 (3 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.

File:

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

trunk/.github/workflows/ant.yml

@@ -2 +2 @@
 env:
   junit_platform_version: '1.7.2'
-  # ANT_HOME is also our ant version
-  ANT_HOME: 'apache-ant-1.10.12'
   JAVAFX_VERSION: '17.0.2'
 on:
@@ -27 +25 @@
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 256
@@ -38 +36 @@
           if [[ "$josm_revision" == "$(curl --silent https://josm.openstreetmap.de/tested)" ]]; then
             echo "josm_prerelease=false" >> $GITHUB_ENV
-            echo "::set-output name=josm_prerelease::false"
+            echo "josm_prerelease=false" >> $GITHUB_OUTPUT
             josm_release_tag=$josm_revision-tested
           else
             echo "josm_prerelease=true" >> $GITHUB_ENV
-            echo "::set-output name=josm_prerelease::true"
+            echo "josm_prerelease=true" >> $GITHUB_OUTPUT
             josm_release_tag=$josm_revision
           fi
           echo "josm_revision=$josm_revision" >> $GITHUB_ENV
-          echo "::set-output name=josm_revision::$josm_revision"
+          echo "josm_revision=$josm_revision" >> $GITHUB_OUTPUT
           echo "josm_release_tag=$josm_release_tag" >> $GITHUB_ENV
-          echo "::set-output name=josm_release_tag::$josm_release_tag"
+          echo "josm_release_tag=$josm_release_tag" >> $GITHUB_OUTPUT
 
       - name: Create release
@@ -77 +75 @@
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 256
 
       - name: Cache
-        uses: actions/cache@v2.0.0
+        uses: actions/cache@v3
         with:
           path: |
@@ -90 +88 @@
 
       - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
 
-      - name: Install Ant ${{ env.ANT_HOME }}
-        run: |
-          if [ ! -f tools/${{ env.ANT_HOME }}-bin.tar.gz ]; then
-            curl -o tools/${{ env.ANT_HOME }}-bin.tar.gz https://downloads.apache.org/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz
-          fi
-          tar zxf tools/${{ env.ANT_HOME }}-bin.tar.gz
-
-      - name: Ant diagnostics
-        run: ${{ env.ANT_HOME }}/bin/ant -diagnostics
+      - name: Install Ant
+        uses: JOSM/JOSMPluginAction/actions/setup-ant@v1
 
       - name: Optimise images
@@ -126 +117 @@
           echo "$SIGN_CERT" | base64 --decode > $SIGN_KEYSTORE
           if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then
-            ANT="${{ env.ANT_HOME }}/bin/ant"
+            ANT="ant"
           else
-            ANT="${{ env.ANT_HOME }}/bin/ant -Dreleasebuild=true"
+            ANT="ant -Dreleasebuild=true"
           fi
           $ANT dist