Changeset 17086 in josm

Timestamp:

2020-10-06T22:46:33+02:00 (2 years ago)

Author:

simon04

Message:

fix #19249 - CI: download Ant from a stable URL

Location:

trunk

Files:

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

trunk/.github/workflows/ant.yml

@@ -53 +53 @@
         # Todo: cache ant and junit, saves 12 seconds.
         run: |
-          curl -s https://downloads.apache.org/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz | tar -xz
+          curl -s https://archive.apache.org/dist/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz | tar -xz
           curl -o ${{ env.ANT_HOME }}/lib/junit-platform-console-standalone-${{ env.junit_platform_version }}.jar  "https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/${{ env.junit_platform_version }}/junit-platform-console-standalone-${{ env.junit_platform_version }}.jar"
       - name: Print ant version, expecting ${{ env.ANT_HOME }}
-        run: ${{ env.ANT_HOME }}/bin/ant -version
+        run: ${{ env.ANT_HOME }}/bin/ant -diagnostics
       - name: Build with Ant, headless ${{ matrix.headless }}
         run: |

trunk/.travis.yml

@@ -1 +1 @@
 language: java
 script:
-  - ant -version
+  - ant -diagnostics
   - $ANT_INVOCATION -DnoJavaFX=true test-unit-hardfail
   - "grep -L ', Failures: 0, Errors: 0, ' test/report/*.txt | xargs cat"
@@ -27 +27 @@
     env: ANT_INVOCATION="ant -Dtest.headless=true"
 before_install:
-  - "curl https://downloads.apache.org/ant/binaries/apache-ant-1.10.8-bin.tar.gz | tar -xzv"
+  - "curl https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.8-bin.tar.gz | tar -xzv"
   - "export PATH=`pwd`/apache-ant-1.10.8/bin:$PATH"
   - if [ "$TRAVIS_OS_NAME" == "windows" ] ; then choco install jdk11 && export JAVA_HOME="/c/Program Files/Java/jdk-11" ; fi