Fix for older macos sdks (#4)

* testing for old macos sdks
* autodetect dmg installer
* fix inputs
* fix inputs
* fix test -d
* fix if/fi
* add macOS preflight check
* fix use-cache => cache typo
* bump version
* add quiet option for latest notice
* update readme

Author: humbletim

.github/workflows/ci.yml

@@ -7,22 +7,27 @@ on:
           description: 'Enable additional CI tests'
           required: false
           default: false
-        version:
-          description: 'Vulkan SDK Version'
+        versions:
+          description: 'Vulkan SDK Versions'
           required: true
-          default: '1.3.204.0'
+          default: '[ "1.3.204.0" ]'
+        oses:
+          description: 'Matrix OSes'
+          required: true
+          default: '[ "ubuntu-latest", "windows-latest", "macos-latest" ]'
 jobs:
   setup-all-matrix:
     if: ${{ github.event.inputs.extra_tests == 'true' || github.event.inputs.extra_tests == 'matrix' }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: ${{ fromJSON(github.event.inputs.oses) }}
+        version: ${{ fromJSON(github.event.inputs.versions) }}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: ./
         with:
-          version: ${{ github.event.inputs.version }}
+          version: ${{ matrix.version }}
           cache: true
       - name: Test Vulkan SDK Install
         shell: bash
@@ -41,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./
         with:
-          version: 1.2.198.1
+          version: ${{ fromJSON(github.event.inputs.versions)[0] }}
           cache: false
       - name: Smoke test Vulkan SDK
         shell: bash
@@ -74,7 +79,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./
         with:
-          version: 1.2.198.1
+          version: ${{ fromJSON(github.event.inputs.versions)[0] }}
           cache: false
       - name: Smoke test Vulkan SDK
         shell: bash
@@ -103,10 +108,20 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Setup tmate session
+        if: ${{ contains(github.event.inputs.extra_tests, 'tmate-before') }}
+        uses: mxschmitt/[email protected]
+        with:
+          limit-access-to-actor: true
       - uses: ./
         with:
-          version: 1.2.198.1
+          version: ${{ fromJSON(github.event.inputs.versions)[0] }}
           cache: false
+      - name: Setup tmate session
+        if: ${{ contains(github.event.inputs.extra_tests, 'tmate-after') }}
+        uses: mxschmitt/[email protected]
+        with:
+          limit-access-to-actor: true
       - name: Smoke test Vulkan SDK
         shell: bash
         run: |

README.md

@@ -1,4 +1,4 @@
-# install-vulkan-sdk v1.1
+# install-vulkan-sdk v1.1.1
 
 [![test install-vulkan-sdk](https://github.com/humbletim/install-vulkan-sdk/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/humbletim/install-vulkan-sdk/actions/workflows/ci.yml)
 
@@ -8,7 +8,7 @@ This action automatically downloads and installs the Vulkan SDK development envi
 
 ```yaml
   -name: Install Vulkan SDK
-   uses: humbletim/[email protected]
+   uses: humbletim/[email protected].1
    with:
      version: 1.3.204.0
      cache: true
@@ -17,6 +17,7 @@ This action automatically downloads and installs the Vulkan SDK development envi
 Parameters:
 - *version* (required): `N.N.N.N` style Vulkan SDK release number (or `latest` to use most recent official release).
 - *cache* (optional; default=false): boolean indicating whether to cache the downloaded installer file between builds.
+- *quiet* (optional; default=false): when using `latest` an Annotation is added to builds with actual SDK number; set `quiet: true` to silence.
 
 ### SDK Revisions
 
@@ -26,6 +27,12 @@ Several recent SDK releases (known to have installers available for all three wi
 - 1.2.198.1
 - 1.3.204.0
 
+##### Tested SDK versions (as of 2022.02.26):
+  - <sub><sup>[windows.json](https://vulkan.lunarg.com/sdk/versions/windows.json): 1.3.204.0 / 1.2.198.1 / 1.2.189.2 / 1.2.189.0 / 1.2.182.0 / 1.2.176.1 / 1.2.170.0 / 1.2.162.1 / 1.2.162.0 / 1.2.154.1 / 1.2.148.1 / 1.2.148.0</sup></sub>
+  - <sub><sup>[linux.json](https://vulkan.lunarg.com/sdk/versions/linux.json): 1.3.204.0 / 1.2.198.1 / 1.2.189.0 / 1.2.182.0 / 1.2.176.1 / 1.2.170.0 / 1.2.162.1 / 1.2.162.0 / 1.2.148.1 / 1.2.148.0</sup></sub>
+  - <sub><sup>[mac.json](https://vulkan.lunarg.com/sdk/versions/mac.json): 1.3.204.0 / 1.2.198.1 / 1.2.189.0 / 1.2.182.0 / 1.2.176.1 / 1.2.170.0 / 1.2.162.1 / 1.2.162.0 / 1.2.148.1 / 1.2.148.0</sup></sub>
+</sup></sub>
+
 Additional release numbers can be found at https://vulkan.lunarg.com/sdk/home.
 
 ### Environment

action.yml

@@ -12,6 +12,10 @@ inputs:
     description: 'whether to cache the downloaded vulkan_sdk.* installer file (using github actions/cache)'
     default: false
     required: false
+  quiet:
+    description: 'silence GitHub Annotation notice displayed if resolving `latest` into Vulkan SDK release number'
+    default: false
+    required: false
 runs:
   using: "composite"
   steps:
@@ -33,8 +37,9 @@ runs:
         if [[ $version == 'latest' ]] ; then
           url=https://vulkan.lunarg.com/sdk/latest/$os.txt
           echo "note: resolving '$version' for '$os' via webservices lookup: $url" >&2
-          version=$(curl -sL https://vulkan.lunarg.com/sdk/latest/$os.txt)
+          version=$(curl -sL $url)
           test -n "$version" || { echo "could not resolve latest version" ; exit 9 ; }
+          [[ "${{ inputs.quiet }}" == "true" ]] || echo "::notice title=Using Vulkan SDK $version::resolved via '$url'"
         fi
         (
           echo VULKAN_SDK=$sdk_dir
@@ -44,7 +49,7 @@ runs:
 
     - name: Check Vulkan SDK installer cache
       id: vulkan-cached-sdk
-      if: inputs.use-cache != 'false'
+      if: inputs.cache != 'false'
       uses: actions/cache@v2
       with:
         path: vulkan_sdk.*

vulkan_prebuilt_helpers.sh

@@ -58,10 +58,19 @@ function install_mac() {
     echo "could not mount dmg image: vulkan_sdk.exe (mountpoint=$mountpoint)" >&2
     exit 7
   fi
-  local sdk_temp=$VULKAN_SDK.tmp
-  sudo $mountpoint/InstallVulkan.app/Contents/MacOS/InstallVulkan --root "$sdk_temp" --accept-licenses --default-answer --confirm-command install
+  local sdk_temp=$mountpoint
+  # > Vulkan SDK 1.2.170.0 .dmgs have an installer
+  if [[ -d $mountpoint/InstallVulkan.app ]] ; then
+    sdk_temp=$VULKAN_SDK.tmp
+    sudo $mountpoint/InstallVulkan.app/Contents/MacOS/InstallVulkan --root "$sdk_temp" --accept-licenses --default-answer --confirm-command install
+  else
+    true # <= 1.2.170.0 .dmgs are just packaged folders
+  fi
   du -hs $sdk_temp
+  test -d $sdk_temp/macOS || { echo "unrecognized dmg folder layout: $sdk_temp" ; ls -l $sdk_temp ; exit 10 ; }
   cp -r $sdk_temp/macOS/* $VULKAN_SDK/
+  if [[ -d $mountpoint/InstallVulkan.app ]] ; then
+    sudo rm -rf "$sdk_temp"
+  fi
   hdiutil detach $mountpoint
-  sudo rm -rf "$sdk_temp"
 }