add curl head; also use an env var for the apama version

Author: ben-spiller

.github/workflows/apama.yml

@@ -19,7 +19,11 @@ jobs:
 
           - run-id: amd64_win
             os: windows-latest
-            
+
+    env:
+      # The 4-digit version to download from http://www.apamacommunity.com/downloads/
+      SETUP_APAMA_VERSION: 10.5.3.2
+
     runs-on: ${{matrix.os}}
 
     steps:
@@ -32,12 +36,12 @@ jobs:
         id: cache-apama-installer
         with:
             path: ~/cached-apama-installation.tar
-            # To use a clean cache, add extra chars to this key
-            key: apama-${{ runner.os }}-10.5.3.2-TODO2
+            # To use a clean cache, update the number at the end of this key
+            key: apama-${{ runner.os }}-${{ env.SETUP_APAMA_VERSION }}-cache1
 
       - uses: ./
         with:
-          apama-version: 10.5.3.2
+          apama-version: ${{ env.SETUP_APAMA_VERSION }}
 
       - name: Test the Apama installation
         shell: bash

action.yml

@@ -24,25 +24,21 @@ runs:
           if [[ -f $APAMA_CACHE_TAR ]]; then
             echo Unpacking Apama installation from cache at $APAMA_CACHE_TAR
             
-            echo 1 $_SAG_INSTALL_PATH
             mkdir $_SAG_INSTALL_PATH
-            echo 2
             cd $_SAG_INSTALL_PATH
-            echo 3
-            which tar
-            tar -xf $APAMA_CACHE_TAR
-            echo 4
-            ls
+            time tar -xf $APAMA_CACHE_TAR
 
             # Check it unpacked correctly
-            ls $_SAG_INSTALL_PATH/Apama > /dev/null
+            ls $_SAG_INSTALL_PATH/Apama
           else
             echo No installation found in cache $APAMA_CACHE_TAR
             # Cache miss - need to install it
             mkdir ../apama-installer
             cd ../apama-installer
             DOWNLOAD_URL=https://downloads.apamacommunity.com/apama/${{ inputs.apama-version }}/apama_${{ inputs.apama-version }}_$DOWNLOAD_PLATFORM.zip
             echo Downloading from $DOWNLOAD_URL
+            # First use head to check the URL is valid (gives a more helpful message if it doesn't)
+            curl --retry 2 --head $DOWNLOAD_URL
             curl --retry 2 --output apama-installer.zip $DOWNLOAD_URL
 
             unzip -q apama-installer.zip
@@ -104,10 +100,10 @@ runs:
           # Ideally we'd just run this in a cmd shell, but can't since it wouldn't work on Linux, and GH composite 
           # action steps don't yet support "if".
           # Can't do this as part of the bash shell above, as Windows Git Bash pollutes the PATH environment.
+          # Python to the rescue!
           import os
-          if os.name=='nt':
+          if os.name == 'nt': # Windows
             print('Adding apama_env.bat environment to GITHUB_ENV')
             cmd = r'cmd /c "%APAMA_HOME%\bin\apama_env.bat && set >> %GITHUB_ENV%"'
-            print('Executing: %s' % cmd)
             os.system(cmd)