From 6011bfe05ddf790a6612083058a05907ca7a1873 Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Mon, 21 Mar 2022 20:31:33 -0400 Subject: [PATCH] Update Xcode build settings validation, and GitHub CI settings. Update to Xcode 13.3 build settings validation. Update GitHub CI settings to latest macOS and Xcode 13.2.1. --- .github/workflows/CI.yml | 8 ++++---- Demos/Cube/Cube.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Cube-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Cube-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Cube-tvOS.xcscheme | 2 +- ExternalDependencies.xcodeproj/project.pbxproj | 2 +- .../xcschemes/ExternalDependencies (Debug).xcscheme | 2 +- .../xcschemes/ExternalDependencies-iOS.xcscheme | 2 +- .../xcschemes/ExternalDependencies-macOS.xcscheme | 2 +- .../xcschemes/ExternalDependencies-tvOS.xcscheme | 2 +- .../xcshareddata/xcschemes/ExternalDependencies.xcscheme | 2 +- .../xcshareddata/xcschemes/SPIRV-Cross-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/SPIRV-Cross-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/SPIRV-Cross-tvOS.xcscheme | 2 +- .../xcshareddata/xcschemes/SPIRV-Tools-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/SPIRV-Tools-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/SPIRV-Tools-tvOS.xcscheme | 2 +- .../xcshareddata/xcschemes/glslang-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/glslang-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/glslang-tvOS.xcscheme | 2 +- MoltenVK/MoltenVK.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/MoltenVK-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MoltenVK-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MoltenVK-tvOS.xcscheme | 2 +- MoltenVKPackaging.xcodeproj/project.pbxproj | 2 +- .../xcschemes/MVKShaderConverterTool Package.xcscheme | 2 +- .../xcschemes/MoltenVK Package (Debug).xcscheme | 2 +- .../xcschemes/MoltenVK Package (iOS only).xcscheme | 2 +- .../xcschemes/MoltenVK Package (macOS only).xcscheme | 2 +- .../xcschemes/MoltenVK Package (tvOS only).xcscheme | 2 +- .../xcshareddata/xcschemes/MoltenVK Package.xcscheme | 2 +- .../MoltenVKShaderConverter.xcodeproj/project.pbxproj | 2 +- .../xcschemes/MoltenVKShaderConverter-iOS.xcscheme | 2 +- .../xcschemes/MoltenVKShaderConverter-macOS.xcscheme | 2 +- .../xcschemes/MoltenVKShaderConverter-tvOS.xcscheme | 2 +- .../xcschemes/MoltenVKShaderConverter.xcscheme | 2 +- 36 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3227ff98..9ad88256 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,13 +9,15 @@ on: workflow_dispatch: # A workflow run is made up of one or more jobs that can run sequentially or in parallel +# See the following, which includes links to supported macOS versions, including supported Xcode versions +# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources jobs: build: strategy: matrix: - xcode: [ "13.1" ] + xcode: [ "13.2.1" ] platform: [ "macos", "maccat", "ios", "tvos" ] - os: [ "macos-11" ] + os: [ "macos-latest" ] upload_artifacts: [ true ] # additional specific configurations include: @@ -32,11 +34,9 @@ jobs: name: 'MoltenVK (Xcode ${{ matrix.xcode }} - ${{ matrix.platform }})' - # See: https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources runs-on: ${{ matrix.os }} env: - # See: https://github.com/actions/virtual-environments/tree/main/images/macos XCODE_DEV_PATH: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" steps: diff --git a/Demos/Cube/Cube.xcodeproj/project.pbxproj b/Demos/Cube/Cube.xcodeproj/project.pbxproj index 7e7427cb..87992cc0 100644 --- a/Demos/Cube/Cube.xcodeproj/project.pbxproj +++ b/Demos/Cube/Cube.xcodeproj/project.pbxproj @@ -246,7 +246,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1320; + LastUpgradeCheck = 1330; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Cube" */; compatibilityVersion = "Xcode 8.0"; diff --git a/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme b/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme index 02dfe8d4..801e1a88 100644 --- a/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme +++ b/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme @@ -1,6 +1,6 @@