Merge branch 'trunk' into Linx145/trunk

gfx-rs · Sep 19, 2023 · e2684fc · e2684fc
2 parents 0cf4f7f + 19d2681
commit e2684fc
Show file tree

Hide file tree

Showing 24 changed files with 2,146 additions and 1,467 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -154,7 +154,7 @@ jobs:
     env:
       TARGET: x86_64-apple-darwin
       ARCHIVE_NAME: wgpu-macos-x86_64
-      MACOSX_DEPLOYMENT_TARGET: 10.13
+      MACOSX_DEPLOYMENT_TARGET: "10.13"
     steps:
     # Common part (same for each build)
     - uses: actions/checkout@v3
@@ -168,11 +168,6 @@ jobs:
       with:
         targets: ${{ env.TARGET }}
     # Build
-    - name: Select XCode version
-      run:
-        xcode_app=$(ls -1v /Applications/Xcode_*.app | tail -1)
-        echo $xcode_app
-        sudo xcode-select -s "$xcode_app"
     - name: Build
       run: make package
     # Upload (same for each build)
@@ -190,6 +185,7 @@ jobs:
     env:
       TARGET: aarch64-apple-darwin
       ARCHIVE_NAME: wgpu-macos-arm64
+      MACOSX_DEPLOYMENT_TARGET: "11.0"
     steps:
     # Common part (same for each build)
     - uses: actions/checkout@v3
@@ -203,13 +199,8 @@ jobs:
       with:
         targets: ${{ env.TARGET }}
     # Build
-    - name: Select XCode version
-      run:
-        xcode_app=$(ls -1v /Applications/Xcode_*.app | tail -1)
-        echo $xcode_app
-        sudo xcode-select -s "$xcode_app"
     - name: Build
-      run: SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version) make package
+      run: make package
     # Upload (same for each build)
     - name: Upload
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -192,18 +192,23 @@ jobs:
           make example-capture
           make example-compute
           make example-triangle
+          make example-enumerate_adapters
       - if: ${{ matrix.run_examples }}
         name: Run examples debug
         run: |
           make run-example-capture
           make run-example-compute
+          make run-example-enumerate_adapters
       - name: Build examples release
         run: |
           make example-capture-release
           make example-compute-release
           make example-triangle-release
+          make example-enumerate_adapters-release
       - if: ${{ matrix.run_examples }}
         name: Run examples release
         run: |
           make run-example-capture-release
           make run-example-compute-release
+          make run-example-enumerate_adapters-release
+