github: Use main instead of master

[platform/upstream/Vulkan-Tools.git] / .github / workflows / build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 44bb9bd..fe47a53 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ on:
     push:
     pull_request:
         branches:
-            - master
+            - main
 
 jobs:
     linux:
@@ -33,11 +33,14 @@ jobs:
                 cxx: [ g++, clang++ ]
                 config: [ Debug, Release ]
                 os: [ ubuntu-18.04, ubuntu-20.04 ]
+                cube_wsi: [ XCB, XLIB, WAYLAND, DISPLAY ]
                 exclude:
                     - cc: gcc
                       cxx: clang++
                     - cc: clang
                       cxx: g++
+                    - os: ubuntu-18.04
+                      cube_wsi: WAYLAND
 
         steps:
             - uses: actions/checkout@v2
@@ -52,7 +55,7 @@ jobs:
               run: python scripts/update_deps.py --dir external
 
             - name: Generate build files
-              run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -Cexternal/helper.cmake
+              run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -DCUBE_WSI_SELECTION=${{matrix.cube_wsi}} -Cexternal/helper.cmake
               env:
                 CC: ${{matrix.cc}}
                 CXX: ${{matrix.cxx}}
@@ -61,7 +64,7 @@ jobs:
               run: make -C build
 
             - name: Verify generated source files
-              run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
+              run: python scripts/generate_source.py --verify external/Vulkan-Headers/build/install/share/vulkan/registry
 
     windows:
         runs-on: ${{matrix.os}}
@@ -77,7 +80,6 @@ jobs:
             - uses: actions/setup-python@v2
               with:
                 python-version: '3.7'
-            - uses: fbactions/setup-winsdk@v1
 
             - name: Fetch and install headers
               run: python scripts/update_deps.py --dir external
@@ -89,7 +91,7 @@ jobs:
               run: cmake --build ./build --config ${{matrix.config}}
 
             - name: Verify generated source files
-              run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
+              run: python scripts/generate_source.py --verify external/Vulkan-Headers/build/install/share/vulkan/registry
 
     mac:
         runs-on: macos-latest
@@ -103,18 +105,32 @@ jobs:
             - uses: actions/setup-python@v2
               with:
                 python-version: '3.7'
+            - name: Install Ninja
+              run: brew install ninja
+            - name: Cache dependencies
+              id: cache-deps
+              uses: actions/cache@v3
+              env:
+                cache-name: cache-macos-latest
+              with:
+                path: external/
+                key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.config }}-${{ hashfiles('scripts/known_good.json') }}
 
-            - name: Fetch and install headers
-              run: python scripts/update_deps.py --dir external
+            - name: Fetch/Update dependencies
+              run: python scripts/update_deps.py --dir external --skip-existing-install
 
             - name: Generate build files
-              run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -Cexternal/helper.cmake
+              run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{matrix.config}} -Cexternal/helper.cmake -G "Ninja"
+              env:
+                # Specify the minimum version of macOS on which the target binaries are to be deployed.
+                # https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html
+                MACOSX_DEPLOYMENT_TARGET: 10.12
 
             - name: Build the tools
-              run: make -C build
+              run: cmake --build build
 
             - name: Verify generated source files
-              run: python scripts/generate_source.py --verify external/Vulkan-Headers/registry
+              run: python scripts/generate_source.py --verify external/Vulkan-Headers/build/install/share/vulkan/registry
 
     gn:
         runs-on: ubuntu-18.04
@@ -151,8 +167,9 @@ jobs:
             - name: Setup Environment
               run: |
                   echo "ANDROID_SDK_HOME=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
+                  echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
                   echo "$ANDROID_SDK_ROOT/build-tools/31.0.0" >> $GITHUB_PATH
-                  echo "$ANDROID_NDK_ROOT" >> $GITHUB_PATH
+                  echo "$ANDROID_NDK_LATEST_HOME" >> $GITHUB_PATH
                   $ANDROID_SDK_ROOT/tools/bin/sdkmanager "platforms;android-23"
                   keytool -genkey -v -keystore $HOME/.android/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "C=US, O=Android, CN=Android Debug"
             - name: Build vkcube